Merge pull request #151 from r00tat/enhancement/rename-app

Prepare 2.0 release
r00tat · Sep 28, 2024 · b0d93d4 · b0d93d4
2 parents 0cdd06b + eb0f77a
commit b0d93d4
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Hydrantenkarte der Freiwilligen Feuerwehr Neusiedl am See
+# Einsatzkarte der Freiwilligen Feuerwehr Neusiedl am See
 
 Dieses Repository ermöglicht es Hydranten auf einer Karte darzustellen. Ziel ist es möglichst leicht im Einsatzfall Hydranten lokalisieren zu können.
 

diff --git a/firebase.json b/firebase.json
@@ -2,13 +2,13 @@
   "firestore": [
     {
       "database": "(default)",
-      "rules": "firestore.rules",
-      "indexes": "firestore.indexes.json"
+      "rules": "firebase/prod/firestore.rules",
+      "indexes": "firebase/prod/firestore.indexes.json"
     },
     {
       "database": "ffndev",
-      "rules": "firestore.dev.rules",
-      "indexes": "firestore.indexes.dev.json"
+      "rules": "firebase/dev/firestore.rules",
+      "indexes": "firebase/dev/firestore.indexes.json"
     }
   ]
 }
diff --git a/firestore.indexes.dev.json → firebase/dev/firestore.indexes.json b/firestore.indexes.dev.json → firebase/dev/firestore.indexes.json
diff --git a/firestore.dev.rules → firebase/dev/firestore.rules b/firestore.dev.rules → firebase/dev/firestore.rules
diff --git a/firebase/prod/firestore.indexes.json b/firebase/prod/firestore.indexes.json
@@ -0,0 +1,51 @@
+{
+  "indexes": [
+    {
+      "collectionGroup": "call",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "deleted",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "date",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "call",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "group",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "date",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "call",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "deleted",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "group",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "date",
+          "order": "DESCENDING"
+        }
+      ]
+    }
+  ],
+  "fieldOverrides": []
+}
diff --git a/firestore.rules → firebase/prod/firestore.rules b/firestore.rules → firebase/prod/firestore.rules
@@ -11,7 +11,7 @@ service cloud.firestore {
 
     function adminUser() {
       return request.auth != null && 
-         get(/databases/$(database)/documents/user/$(request.auth.uid)).data.isAdmin == true;
+      get(/databases/$(database)/documents/user/$(request.auth.uid)).data.isAdmin == true;
     }
 
     match /hydrant/{doc=*} {
@@ -32,7 +32,8 @@ service cloud.firestore {
     }
 
     match /call/{doc=**} {
-      allow read, write: if authorizedUser()
+      allow read, write: if authorizedUser() 
+            && resource.data.group in get(/databases/$(database)/documents/user/$(request.auth.uid)).data.groups 
     }
 
     match /clusters/{doc=**} {
@@ -41,6 +42,7 @@ service cloud.firestore {
 
     match /clusters6/{doc=**} {
       allow read: if authorizedUser();
+      allow write: if adminUser();
     }
 
     match /tokens/{doc=**} {
@@ -49,14 +51,9 @@ service cloud.firestore {
         allow write: if authorizedUser() && request.auth.uid == request.resource.data.owner;
     }
 
-
     match /user/{doc=*} {
       allow read: if request.auth != null && request.auth.uid == doc
     }
-      match /clusters6/{doc=**} {
-      allow read: if authorizedUser();
-      allow write: if adminUser();
-    }
 
     match /{document=**} {
       allow read, write: if adminUser();

diff --git a/firestore.indexes.json b/firestore.indexes.json
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -4,8 +4,8 @@ import AppProviders from '../components/providers/AppProviders';
 import '../styles/globals.css';
 import 'leaflet/dist/leaflet.css';
 
-const APP_NAME = 'Hydrantenkarte FFN';
-const APP_DEFAULT_TITLE = 'Hydrantenkarte FFN';
+const APP_NAME = 'Einsatzkarte FFN';
+const APP_DEFAULT_TITLE = 'Einsatzkarte FFN';
 const APP_TITLE_TEMPLATE = '%s - PWA App';
 const APP_DESCRIPTION = 'Hydraten und Einsatzkarte der FF Neusiedl am See';
 
@@ -60,10 +60,10 @@ export default function RootLayout({
   return (
     <html lang="de">
       <head>
-        <title>Hydrantenkarte</title>
+        <title>Einsatzkarte</title>
         <meta
           name="description"
-          content="Hydrantenkarte der Freiwilligen Feuerwehr Neusiedl am See"
+          content="Einsatzkarte der Freiwilligen Feuerwehr Neusiedl am See"
         />
         <link rel="icon" href="/favicon.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/src/app/manifest.json b/src/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-manifest-combined.json",
-  "name": "Hydrantenkarte FFN",
-  "short_name": "Hydrantenkarte",
+  "name": "Einsatzkarte FFN",
+  "short_name": "Einsatzkarte",
   "theme_color": "#1976d2",
   "background_color": "#ffffff",
   "display": "standalone",

diff --git a/src/components/Map/Map.tsx b/src/components/Map/Map.tsx
@@ -81,7 +81,11 @@ export default function Map() {
         {Object.entries(overlayLayers)
           .filter(([key, layer]) => (layer.type || 'WTMS') == 'WTMS')
           .map(([key, layer]) => (
-            <LayersControl.Overlay name={layer.name} key={key}>
+            <LayersControl.Overlay
+              name={layer.name}
+              key={key}
+              checked={layer.enabled}
+            >
               <TileLayer
                 attribution={layer.options.attribution}
                 url={layer.url}

diff --git a/src/components/Map/tiles.ts b/src/components/Map/tiles.ts
@@ -11,6 +11,7 @@ export interface TileConfig {
   options: TileOptions;
   description?: string;
   type?: 'WMTS' | 'WMS';
+  enabled?: boolean;
 }
 
 export interface TileConfigs {
@@ -111,6 +112,7 @@ export const overlayLayers: TileConfigs = {
         [49.037872, 17.189532],
       ],
     },
+    enabled: true,
   },
 
   oberflaechenwasser: {

diff --git a/src/components/actions/maps/places.ts b/src/components/actions/maps/places.ts
@@ -22,7 +22,7 @@ export async function searchPlace(
   // console.info(`uri: ${uri}`);
   const result = await fetch(uri, {
     headers: {
-      'User-Agent': 'Hydrantenkarte https://hydrant.ffnd.at',
+      'User-Agent': 'Einsatzkarte https://hydrant.ffnd.at',
       Accept: 'application/json',
     },
   });

diff --git a/src/components/pages/LoginUi.tsx b/src/components/pages/LoginUi.tsx
@@ -29,7 +29,7 @@ export default function LoginUi() {
         <>
           <Paper sx={{ p: 2, m: 2 }}>
             <Typography>
-              Für die Nutzung der Hydrantenkarte ist eine Anmeldung und manuelle
+              Für die Nutzung der Einsatzkarte ist eine Anmeldung und manuelle
               Freischaltung erforderlich. Bitte registriere dich hier.
             </Typography>
             <StyledLoginButton firebaseAuth={auth} />
@@ -61,7 +61,7 @@ export default function LoginUi() {
               </Typography>
               <Typography>
                 <Link href="/" passHref legacyBehavior>
-                  <Button variant="outlined">Weiter zur Hydrantenkarte</Button>
+                  <Button variant="outlined">Weiter zur Einsatzkarte</Button>
                 </Link>
               </Typography>
             </>
@@ -70,7 +70,7 @@ export default function LoginUi() {
             <Typography>
               Dein Benutzer wurde erfolgreich angemeldet, ist aber noch nicht
               freigeschalten. Bitte wende dich an{' '}
-              <a href="mailto:hydrantenmap@ff-neusiedlamsee.at&amp;subject=Hydrantenkarte Freischaltung">
+              <a href="mailto:hydrantenmap@ff-neusiedlamsee.at&amp;subject=Einsatzkarte Freischaltung">
                 hydrantenmap@ff-neusiedlamsee.at
               </a>{' '}
               für die Freischaltung

diff --git a/src/components/site/HeaderBar.tsx b/src/components/site/HeaderBar.tsx
@@ -37,7 +37,7 @@ function HeaderBar({
             <MenuIcon />
           </IconButton>
           <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
-            Hydrantenkarte {firecall?.name || ''}
+            Einsatzkarte {firecall?.name || ''}
             {!isSignedIn && 'Anmeldung erforderlich'}
             {isSignedIn && !isAuthorized && 'Freischaltung erforderlich'}
           </Typography>