Compare commits

..

No commits in common. "48b669dc07a2aa34aa38feb4b8037e0e51cf0f94" and "d358611133131b36970b4e887d3b69b184241556" have entirely different histories.

4 changed files with 5 additions and 18 deletions

View File

@ -35,7 +35,7 @@ jobs:
- name: Build and push Website - name: Build and push Website
uses: docker/build-push-action@v6.7.0 uses: docker/build-push-action@v6.7.0
with: with:
context: . context: ./Website
file: ./Dockerfile file: ./Dockerfile
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
platforms: linux/amd64 platforms: linux/amd64

View File

@ -1,17 +1,4 @@
# Build stage FROM nginx:alpine3.17-slim
FROM node:20-alpine AS builder COPY . /usr/share/nginx/html
WORKDIR /app
COPY . /app
RUN npm install
RUN npm run build
# Serve stage
FROM nginx:alpine3.17-slim
# Copy built files from Vite's dist folder
COPY --from=builder /app/Website/dist /usr/share/nginx/html
COPY --from=builder /app/Website/media /usr/share/nginx/html/media
EXPOSE 80 EXPOSE 80
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

View File

@ -57,7 +57,7 @@ export default function Settings({ backendConnected, apiUri, frontendSettings, s
return ( return (
<div id="Settings"> <div id="Settings">
<div onClick={() => setShowSettings(true)}> <div onClick={() => setShowSettings(true)}>
<img id="Settings-Cogwheel" src="../media/settings-cogwheel.svg" alt="settings-cogwheel" /> <img id="Settings-Cogwheel" src="../../media/settings-cogwheel.svg" alt="settings-cogwheel" />
</div> </div>
{showSettings {showSettings
? <div className="popup" id="SettingsPopUp"> ? <div className="popup" id="SettingsPopUp">

View File

@ -18,7 +18,7 @@ footer {
flex-grow: 1; flex-grow: 1;
text-align: right; text-align: right;
margin-right: 20px; margin-right: 20px;
cursor: url("../media/blahaj.png"), grab; cursor: url("Website/media/blahaj.png"), grab;
} }
footer .statusBadge { footer .statusBadge {