Merge branch 'main' into ahmedeldessouki

OpenSourceRaidGuild · Feb 3, 2021 · e4044ed · e4044ed
2 parents 430711c + 22e691e
commit e4044ed
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/dev-data/firebase-export-metadata.json → devData/firebase-export-metadata.json b/dev-data/firebase-export-metadata.json → devData/firebase-export-metadata.json
@@ -5,4 +5,4 @@
     "path": "firestore_export",
     "metadata_file": "firestore_export/firestore_export.overall_export_metadata"
   }
-}
+}
diff --git a/.../all_namespaces_all_kinds.export_metadata → .../all_namespaces_all_kinds.export_metadata b/.../all_namespaces_all_kinds.export_metadata → .../all_namespaces_all_kinds.export_metadata
diff --git a/..._export/all_namespaces/all_kinds/output-0 → ..._export/all_namespaces/all_kinds/output-0 b/..._export/all_namespaces/all_kinds/output-0 → ..._export/all_namespaces/all_kinds/output-0
diff --git a/.../firestore_export.overall_export_metadata → .../firestore_export.overall_export_metadata b/.../firestore_export.overall_export_metadata → .../firestore_export.overall_export_metadata
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "scripts": {
     "start": "run-p start:firestore start:dev",
     "start:dev": "snowpack dev",
-    "start:firestore": "firebase emulators:start --import=./dev-data --only firestore",
+    "start:firestore": "firebase emulators:start --import=./devData --only firestore",
     "build": "snowpack build",
     "test": "jest --watch --FIRESTORE_EMULATOR_HOST=8080",
     "test:ci": "jest",

diff --git a/src/App.tsx b/src/App.tsx
@@ -8,8 +8,8 @@ import Home from './routes/Home'
 import NotFound from './routes/NotFound'
 import { globalStyles } from './styles/globalStyles'
 
-const AllRaids = React.lazy(() => import('./routes/AllRaids'))
-const ViewRaid = React.lazy(() => import('./routes/ViewRaid'))
+const AllRaids = React.lazy(() => import('./routes/raids'))
+const ViewRaid = React.lazy(() => import('./routes/raids/ViewRaid'))
 
 const AppRouter = () => (
   <React.Suspense fallback={<LoadingSpinner />}>

diff --git a/src/routes/ViewRaid.tsx → src/routes/raids/ViewRaid.tsx b/src/routes/ViewRaid.tsx → src/routes/raids/ViewRaid.tsx
diff --git a/src/routes/AllRaids.tsx → src/routes/raids/index.tsx b/src/routes/AllRaids.tsx → src/routes/raids/index.tsx