diff --git a/Dockerfile b/Dockerfile index 0713a01..b397dfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,7 @@ -FROM oven/bun:latest +FROM nginx -WORKDIR /app +COPY ./dist /usr/share/nginx/html -COPY . . +EXPOSE 80 -RUN bun install - -CMD ["bun", "run", "dev", "--host"] +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 288434f..f657acc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: monitor-im-flur: - image: git.rivercry.com/wg/monitor-im-flur:latest + build: . ports: - "9123:80" restart: unless-stopped diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 11a54dc..0000000 --- a/nginx.conf +++ /dev/null @@ -1,29 +0,0 @@ -http { - - include mime.types; - - set_real_ip_from 0.0.0.0/0; - real_ip_recursive on; - real_ip_header X-Forward-For; - limit_req_zone $binary_remote_addr zone=mylimit:10m rate=10r/s; - - server { - listen 80; - server_name localhost; - root /proxy; - limit_req zone=mylimit burst=70 nodelay; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri /index.html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } -} - -events {} \ No newline at end of file diff --git a/src/assets/clock.png b/public/img/clock.png similarity index 100% rename from src/assets/clock.png rename to public/img/clock.png diff --git a/src/assets/weed.png b/public/img/weed.png similarity index 100% rename from src/assets/weed.png rename to public/img/weed.png diff --git a/public/vite.svg b/public/vite.svg deleted file mode 100644 index e7b8dfb..0000000 --- a/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/react.svg b/src/assets/react.svg deleted file mode 100644 index 6c87de9..0000000 --- a/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/Datetime/Datetime.tsx b/src/components/Datetime/Datetime.tsx index aac7e1b..b8bcc12 100644 --- a/src/components/Datetime/Datetime.tsx +++ b/src/components/Datetime/Datetime.tsx @@ -1,4 +1,7 @@ import { useEffect, useState } from "react"; + +import clockImage from "/img/clock.png" + import style from "./style.module.css"; export default function Datetime() { @@ -26,7 +29,7 @@ export default function Datetime() { return (
- Clock + Clock
diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 7909725..8765cd2 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -1,13 +1,17 @@ import style from "./style.module.css"; +import weedImage from "/img/weed.png" + export default function Footer() { + + return (
4:20 Start diff --git a/vite.config.ts b/vite.config.ts index 08dbeec..f472eb7 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -2,7 +2,6 @@ import path from "node:path"; import react from "@vitejs/plugin-react-swc"; import { defineConfig } from "vite"; -// https://vite.dev/config/ export default defineConfig({ plugins: [react()], resolve: {