Skip to content

Commit

Permalink
Update favicon
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-karlsson committed Mar 21, 2024
1 parent 91df163 commit 9467a82
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 20 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ COPY client/ .
RUN npm run build

# Stage 2: Build the Node server
FROM node:lts-alpine as server-builder
FROM node:lts-alpine

WORKDIR /usr/src/server
COPY server/package*.json ./
RUN npm ci --only=production
COPY server/ .

# Copy the built React app from the client-builder stage
# Copy the built React app from the previous stage
COPY --from=client-builder /usr/src/client/build ./public

# Expose the port that the server is running on
Expand Down
Binary file modified client/public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Council of Foods</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
19 changes: 3 additions & 16 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
import logo from './logo.svg';
import './App.css';
import "./App.css";
import Main from "./components/Main";

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<Main />
</div>
);
}
Expand Down
11 changes: 11 additions & 0 deletions client/src/components/Main.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";

function Main() {
return (
<div>
<h1>Test 2</h1>
</div>
);
}

export default Main;

0 comments on commit 9467a82

Please sign in to comment.