Skip to content

Commit 6968a85

Browse files
author
Sine Jespersen
authored
Merge pull request #23 from itk-dev/feature/CRA-to-vite
Feature/cra to vite
2 parents a3ecb07 + c4366d6 commit 6968a85

16 files changed

+4187
-16861
lines changed

‎ vite-env.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference types="vite/client" />

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ npm run apply-coding-standards
2828
COMPOSE_PROJECT_NAME=aapodwalk
2929
COMPOSE_DOMAIN=aapodwalk.local.itkdev.dk
3030

31-
REACT_APP_API_BASE=API_URL_HERE # most probably https://aapodwalk-api.local.itkdev.dk/
32-
REACT_APP_API_ROUTE=api/v1/
33-
REACT_APP_TOKEN=token_stuff_here # created in api (123?)
31+
VITE_APP_API_BASE=API_URL_HERE # most probably https://aapodwalk-api.local.itkdev.dk/
32+
VITE_APP_API_ROUTE=api/v1/
33+
VITE_APP_TOKEN=token_stuff_here # created in api (123?)
3434

35-
REACT_APP_DF_MAP_USERNAME=username_here # can be found in 1password
36-
REACT_APP_DF_MAP_PASSWORD=password_here # can likewise be found in 1password
35+
VITE_APP_DF_MAP_USERNAME=username_here # can be found in 1password
36+
VITE_APP_DF_MAP_PASSWORD=password_here # can likewise be found in 1password
3737
```

‎docker-compose.server.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure"
3434

3535
node:
36-
image: node:18
36+
image: node:20
3737
command: npm run start
3838
working_dir: /app
3939
networks:

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
# - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
2929

3030
node:
31-
image: node:18
31+
image: node:20
3232
command: npm run start
3333
working_dir: /app
3434
networks:

‎public/index.html‎ renamed to ‎index.html‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,15 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
5+
<link rel="icon" href="/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
<meta name="theme-color" content="#27272A" />
88
<meta
99
name="description"
1010
content="A cool app for something with podcasts and something with walks"
1111
/>
12-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/icon-196.png" />
13-
<!--
14-
manifest.json provides metadata used when your web app is installed on a
15-
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16-
-->
17-
<link rel="manifest" crossorigin="use-credentials" href="%PUBLIC_URL%/manifest.json" />
18-
<!--
19-
Notice the use of %PUBLIC_URL% in the tags above.
20-
It will be replaced with the URL of the `public` folder during the build.
21-
Only files inside the `public` folder can be referenced from the HTML.
22-
23-
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
24-
work correctly both with client-side routing and a non-root public URL.
25-
Learn how to configure a non-root public URL by running `npm run build`.
26-
-->
12+
<link rel="apple-touch-icon" href="/icon-196.png" />
13+
<link rel="manifest" crossorigin="use-credentials" href="/manifest.json" />
2714
<title>Podwalk</title>
2815
</head>
2916
<body style="background-color: rgb(39 39 42);">
@@ -39,5 +26,6 @@
3926
To begin the development, run `npm start` or `yarn start`.
4027
To create a production bundle, use `npm run build` or `yarn build`.
4128
-->
29+
<script type="module" src="/src/index.jsx"></script>
4230
</body>
4331
</html>

0 commit comments

Comments
 (0)