Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update PWA config with 2023 icon requirements and caching #1474

Merged
merged 7 commits into from
May 20, 2024
Merged

Update PWA config with 2023 icon requirements and caching #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad64b52
docs: update description for mkdocs site
spwoodcock Apr 24, 2024
6bd5ae2
build(frontend): move dependencies to correct section (dev/prod)
spwoodcock Apr 24, 2024
df3fe85
feat(frontend): add pwa config with all required icons (2023-minimal)
spwoodcock Apr 24, 2024
8be925c
build: add robots.txt for search engine web scraping
spwoodcock Apr 24, 2024
2abe398
fix(frontend): remove usage of material-icons imported css, use es6 i…
spwoodcock Apr 24, 2024
1300dd6
fix(frontend): update how react app loads, including main.tsx
spwoodcock Apr 24, 2024
07dcaf9
docs: update docstrings around cookie auth
spwoodcock Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env/
build/
develop-eggs/
dist/
dev-dist/
downloads/
eggs/
.eggs/
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
site_name: FMTM
site_description: A project to provide tools for Open Mapping campaigns.
site_description: Coordinated field mapping for Open Mapping campaigns.
# strict: true
site_url: "https://hotosm.github.io/fmtm/"

Expand Down
2 changes: 1 addition & 1 deletion src/backend/app/auth/auth_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ async def callback(request: Request, osm_auth=Depends(init_osm_auth)):
key=cookie_name,
value=access_token,
max_age=31536000, # OSM currently has no expiry
expires=31536000, # OSM currently has no expiry,
expires=31536000, # OSM currently has no expiry
path="/",
domain=settings.FMTM_DOMAIN,
secure=False if settings.DEBUG else True,
Expand Down
21 changes: 15 additions & 6 deletions src/frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="/favicon.ico" />
<link rel="manifest" href="/manifest.json" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<title>Field Mapping Tasking Manager</title>

<meta charset="UTF-8" />
<meta name="description" content="Coordinated field mapping for Open Mapping campaigns." />
<meta name="author" content="Humanitarian OpenStreetMap Team" />
<meta name="format-detection" content="telephone=no, email=no, address=no" />
<meta
name="viewport"
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width"
/>
<meta name="theme-color" content="#d63f3f" />

<link rel="icon" href="/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
</head>

<body>
<div id="app"></div>
<script type="module" src="/src/App.tsx"></script>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
25 changes: 12 additions & 13 deletions src/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,23 @@
"@playwright/test": "^1.43.0",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^12.1.5",
"@types/jest": "^29.5.5",
"@types/node": "^20.12.5",
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-react": "^4.1.0",
"autoprefixer": "^10.4.15",
"css-loader": "^6.3.0",
"env-cmd": "^10.1.0",
"eslint": "^8.51.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.0",
"jest-environment-jsdom": "^29.6.1",
"jsdom": "^22.1.0",
"ol": "^8.0.0",
"ol-layerswitcher": "^4.1.1",
"postcss": "^8.4.28",
"postcss-loader": "^4.1.0",
"prettier": "^3.0.0",
Expand All @@ -45,8 +50,9 @@
"thread-loader": "^3.0.4",
"typescript": "^4.5.2",
"vite": "^4.4.11",
"vite-plugin-pwa": "^0.16.5",
"vitest": "^0.34.6"
"vite-plugin-pwa": "^0.19.8",
"vitest": "^0.34.6",
"workbox-window": "^7.1.0"
},
"dependencies": {
"@capacitor/geolocation": "^5.0.6",
Expand Down Expand Up @@ -80,24 +86,17 @@
"@tiptap/pm": "^2.2.4",
"@tiptap/react": "^2.2.4",
"@tiptap/starter-kit": "^2.2.4",
"@types/jest": "^29.5.3",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"axios": "^1.2.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"date-fns": "^3.3.1",
"env-cmd": "^10.1.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"flatgeobuf": "^3.27.1",
"geojson-validation": "^1.0.2",
"html2canvas": "^1.4.1",
"install": "^0.13.0",
"lucide-react": "^0.276.0",
"mini-css-extract-plugin": "^2.7.5",
"ol": "^8.0.0",
"ol-ext": "^4.0.11",
"ol-layerswitcher": "^4.1.1",
"pako": "^2.1.0",
"pmtiles": "^3.0.5",
"qrcode-generator": "^1.4.4",
Expand Down