mirror of
https://github.com/FoggedLens/deflock.git
synced 2026-02-12 15:02:45 +00:00
update references .me -> .org
This commit is contained in:
@@ -1 +0,0 @@
|
||||
webapp/node_modules/
|
||||
@@ -1,2 +0,0 @@
|
||||
# used for getting list of sponsors
|
||||
GITHUB_TOKEN=github_pat_blah-blah-blah
|
||||
28
Dockerfile
28
Dockerfile
@@ -1,28 +0,0 @@
|
||||
# Stage 1: Build the frontend
|
||||
FROM docker.io/node:22 AS frontend-build
|
||||
WORKDIR /app/frontend
|
||||
COPY webapp/package*.json ./
|
||||
RUN npm install
|
||||
COPY webapp/tsconfig*.json ./
|
||||
COPY webapp/env.d.ts ./
|
||||
COPY webapp/vite.config.ts ./
|
||||
COPY webapp/index.html ./
|
||||
COPY webapp/public ./public/
|
||||
COPY webapp/src ./src/
|
||||
RUN npm run build
|
||||
|
||||
# Stage 2: Build the Scala app
|
||||
FROM docker.io/hseeberger/scala-sbt:8u222_1.3.5_2.13.1 AS scala-build
|
||||
WORKDIR /app
|
||||
COPY shotgun/project/ ./project
|
||||
COPY shotgun/build.sbt ./build.sbt
|
||||
COPY shotgun/ ./
|
||||
COPY --from=frontend-build /app/frontend/dist/ ../webapp/dist/
|
||||
RUN sbt assembly
|
||||
|
||||
# Stage 3: Run the Scala app
|
||||
FROM eclipse-temurin:11-jre-jammy
|
||||
WORKDIR /app
|
||||
COPY --from=scala-build /app/target/scala-2.12/shotgun-assembly-0.1.0-SNAPSHOT.jar ./shotgun-assembly-0.1.0-SNAPSHOT.jar
|
||||
COPY --from=frontend-build /app/frontend/dist/ ../webapp/dist/
|
||||
CMD ["java", "-jar", "shotgun-assembly-0.1.0-SNAPSHOT.jar"]
|
||||
@@ -1,6 +1,6 @@
|
||||
# DeFlock
|
||||
|
||||
Crowdsourced tool for locating and reporting ALPRs. [View Live Site](https://deflock.me).
|
||||
Crowdsourced tool for locating and reporting ALPRs. [View Live Site](https://deflock.org).
|
||||
|
||||

|
||||
|
||||
|
||||
@@ -39,10 +39,8 @@ const start = async () => {
|
||||
origin: (origin, cb) => {
|
||||
const allowedOrigins = [
|
||||
'http://localhost:5173', // vite dev server
|
||||
'https://deflock.me',
|
||||
'https://www.deflock.me',
|
||||
'https://deflock.org', // will migrate
|
||||
'https://www.deflock.org', // will migrate
|
||||
'https://deflock.org',
|
||||
'https://www.deflock.org'
|
||||
];
|
||||
|
||||
if (!origin || allowedOrigins.includes(origin) || /^https:\/\/.*\.deflock\.pages\.dev$/.test(origin)) {
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
---
|
||||
services:
|
||||
deflock:
|
||||
image: public.ecr.aws/w2o0b9g0/deflock.me:latest
|
||||
ports:
|
||||
- 8080:8080
|
||||
restart: always
|
||||
healthcheck:
|
||||
test: curl --fail http://localhost:8080/api/healthcheck || exit 1
|
||||
interval: 30s # Time between health checks
|
||||
timeout: 10s # Time to wait for a response
|
||||
retries: 3 # Number of retries before marking as unhealthy
|
||||
start_period: 10s # Time to wait before starting health checks
|
||||
stdin_open: true
|
||||
environment:
|
||||
- GITHUB_TOKEN
|
||||
48
nginx.conf
48
nginx.conf
@@ -1,48 +0,0 @@
|
||||
user www-data;
|
||||
worker_processes auto;
|
||||
pid /run/nginx.pid;
|
||||
error_log /var/log/nginx/error.log;
|
||||
include /etc/nginx/modules-enabled/*.conf;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||
|
||||
access_log /var/log/nginx/access.log main;
|
||||
error_log /var/log/nginx/error.log warn;
|
||||
sendfile on;
|
||||
keepalive_timeout 65;
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name deflock.me www.deflock.me;
|
||||
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name deflock.me www.deflock.me;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/deflock.me/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/deflock.me/privkey.pem;
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:8080;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,8 +27,8 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta property="og:title" content="DeFlock" />
|
||||
<meta property="og:description" content="Find license plate readers (LPRs) near you." />
|
||||
<meta property="og:image" content="https://deflock.me/og-banner.png" />
|
||||
<meta property="og:url" content="https://deflock.me" />
|
||||
<meta property="og:image" content="https://deflock.org/og-banner.png" />
|
||||
<meta property="og:url" content="https://deflock.org" />
|
||||
<meta property="og:type" content="website" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
|
||||
<title>DeFlock</title>
|
||||
@@ -37,10 +37,10 @@
|
||||
"@context": "https://schema.org",
|
||||
"@type": "Organization",
|
||||
"name": "DeFlock",
|
||||
"url": "https://deflock.me",
|
||||
"url": "https://deflock.org",
|
||||
"sameAs": [
|
||||
"https://github.com/FoggedLens/deflock",
|
||||
"https://blog.deflock.me/",
|
||||
"https://blog.deflock.org/",
|
||||
"https://apps.apple.com/us/app/deflock-me/id6752760780",
|
||||
"https://play.google.com/store/apps/details?id=me.deflock.deflockapp&hl=en_US&pli=1"
|
||||
]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
User-agent: *
|
||||
Allow: /
|
||||
Disallow: /api/
|
||||
Sitemap: https://deflock.me/sitemap.xml
|
||||
Sitemap: https://deflock.org/sitemap.xml
|
||||
|
||||
@@ -1,83 +1,83 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://deflock.me/</loc>
|
||||
<loc>https://deflock.org/</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/map</loc>
|
||||
<loc>https://deflock.org/map</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/about</loc>
|
||||
<loc>https://deflock.org/about</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/what-is-an-alpr</loc>
|
||||
<loc>https://deflock.org/what-is-an-alpr</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/report</loc>
|
||||
<loc>https://deflock.org/report</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/report/id</loc>
|
||||
<loc>https://deflock.org/report/id</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/council</loc>
|
||||
<loc>https://deflock.org/council</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/app</loc>
|
||||
<loc>https://deflock.org/app</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/app/docs</loc>
|
||||
<loc>https://deflock.org/app/docs</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/contact</loc>
|
||||
<loc>https://deflock.org/contact</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/terms</loc>
|
||||
<loc>https://deflock.org/terms</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/privacy</loc>
|
||||
<loc>https://deflock.org/privacy</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/qr</loc>
|
||||
<loc>https://deflock.org/qr</loc>
|
||||
<changefreq>weekly</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/donate</loc>
|
||||
<loc>https://deflock.org/donate</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/foia</loc>
|
||||
<loc>https://deflock.org/foia</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/identify</loc>
|
||||
<loc>https://deflock.org/identify</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/press</loc>
|
||||
<loc>https://deflock.org/press</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/store</loc>
|
||||
<loc>https://deflock.org/store</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/groups</loc>
|
||||
<loc>https://deflock.org/groups</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://deflock.me/blog</loc>
|
||||
<loc>https://deflock.org/blog</loc>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
||||
|
||||
@@ -33,18 +33,18 @@
|
||||
|
||||
<p>
|
||||
<DFCode>
|
||||
<iframe src="https://deflock.me/map" width="100%" height="600" style="border: none;"></iframe>
|
||||
<iframe src="https://deflock.org/map" width="100%" height="600" style="border: none;"></iframe>
|
||||
</DFCode>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you would like to <b>localize the URL</b> to a specific region, please zoom to the area at <router-link to="/map">https://deflock.me/map</router-link> and copy the URL from your browser's address bar.
|
||||
If you would like to <b>localize the URL</b> to a specific region, please zoom to the area at <router-link to="/map">https://deflock.org/map</router-link> and copy the URL from your browser's address bar.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
To <b>remove the header bar</b>, add the following query parameter to the URL: <code>?fullscreen=true</code>. For example:
|
||||
<DFCode>
|
||||
<iframe src="https://deflock.me/map?fullscreen=true#map=14/40.014863/-105.266275" width="100%" height="600" style="border: none;"></iframe>
|
||||
<iframe src="https://deflock.org/map?fullscreen=true#map=14/40.014863/-105.266275" width="100%" height="600" style="border: none;"></iframe>
|
||||
</DFCode>
|
||||
</p>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user