vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

feat: change preview api url #1584

Merged
konrad merged 1 commits from dpschen/frontend:feature/feat-change-preview-api-url into main 2022-02-23 12:05:06 +00:00
Conversation 8 Commits 1 Files Changed 2 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -123,7 +123,6 @@ steps:
- yarn serve:dist & npx wait-on http://localhost:4173
- yarn test:frontend --browser chrome --record
depends_on:
- dependencies
- build-prod
- name: deploy-preview
@ -137,6 +136,9 @@ steps:
GITEA_TOKEN:
from_secret: gitea_token
commands:
- cp -r dist dist-preview
# Override the default api url used for preview
- sed -i 's|localhost:3456|try.vikunja.io|g' dist-preview/index.html
konrad commented 2022-02-20 16:41:25 +00:00
Outdated
Review
Copy Link

Great idea! We should make sure this doesn't interfer with the tests since the same bundle is used for the tests as well.

Great idea! We should make sure this doesn't interfer with the tests since the same bundle is used for the tests as well.
dpschen commented 2022-02-20 17:05:00 +00:00
Outdated
Review
Copy Link

Wouldn't that collide here: 27bba71d8a/.drone.yml (L122) ?

Wouldn't that collide here: https://kolaente.dev/vikunja/frontend/src/commit/27bba71d8a9be9860f59284a8639008cb7a2e1b2/.drone.yml#L122 ?
konrad commented 2022-02-20 17:07:07 +00:00
Outdated
Review
Copy Link

I think so yes. Because yarn serve:dist will only serve whatever is in the dist folder, and if that gets reloaded we'll probably use the wrong api for the tests.

An option would be to wait with the deploy step until the tests are done.

I think so yes. Because `yarn serve:dist` will only serve whatever is in the `dist` folder, and if that gets reloaded we'll probably use the wrong api for the tests. An option would be to wait with the deploy step until the tests are done.
dpschen commented 2022-02-20 17:10:20 +00:00
Outdated
Review
Copy Link

I think linting is fine, since it's so fast (didn't check if we do that already).
If we wait for Cypress it will take a lot longer. I wouldn't like that.

I think linting is fine, since it's so fast (didn't check if we do that already). If we wait for Cypress it will take a lot longer. I wouldn't like that.
konrad commented 2022-02-20 17:26:18 +00:00
Outdated
Review
Copy Link

Then I think copying the dist folder, making the adjustments and then deploying that would be the way to go?

Then I think copying the dist folder, making the adjustments and then deploying that would be the way to go?
👍 1
dpschen commented 2022-02-21 15:33:27 +00:00
Outdated
Review
Copy Link

After thinking about it I think I'm not understanding what you mean, sry :D
What shall I adjust?

After thinking about it I think I'm not understanding what you mean, sry :D What shall I adjust?
konrad commented 2022-02-21 17:02:42 +00:00
Outdated
Review
Copy Link

Something like this:

cp -r dist dist-preview
sed -i 's|http://localhost:3456/api/v1|https://try.vikunja.io/api/v1|g' dist-preview/index.html

And then adjust the netlify deploy script to deploy dist-preview instead of dist.

Something like this: ``` cp -r dist dist-preview sed -i 's|http://localhost:3456/api/v1|https://try.vikunja.io/api/v1|g' dist-preview/index.html ``` And then adjust the netlify deploy script to deploy `dist-preview` instead of `dist`.
👍 1 ✅ 1
dpschen commented 2022-02-21 21:17:31 +00:00
Outdated
Review
Copy Link

Adjusted! :check

Adjusted! :check
konrad commented 2022-02-21 21:36:02 +00:00
Outdated
Review
Copy Link

Does it work? Looks like the link is broken.

Does it work? Looks like the link is broken.
dpschen commented 2022-02-22 16:09:45 +00:00
Outdated
Review
Copy Link

I think I know why. Doesn't netlify build it again?

And if not what else is the yarn build in the netlify.toml for?

I think I know why. Doesn't netlify build it again? And if not what else is the [`yarn build`](https://kolaente.dev/vikunja/frontend/src/commit/b0b314df1a720ca797afaf411515bd955d8074a1/netlify.toml#L2) in the netlify.toml for?
konrad commented 2022-02-23 10:02:28 +00:00
Outdated
Review
Copy Link

Usually netlify builds the site when pusing to the git repo - that's what the config parameter is required for. We're not really using that though.

Usually netlify builds the site when pusing to the git repo - that's what the config parameter is required for. We're not really using that though.
dpschen commented 2022-02-23 11:17:24 +00:00
Outdated
Review
Copy Link

I removed it before – that didn't work. But now it also doesn't work with it :D

I removed it before – that didn't work. But now it also doesn't work with it :D
- shasum -a 384 -c ./scripts/deploy-preview-netlify.js.sha384
- node ./scripts/deploy-preview-netlify.js
depends_on:

2
netlify.toml
View File

@ -1,6 +1,6 @@
[build]
command = "yarn build"
publish = "dist"
publish = "dist-preview"
[[redirects]]
from = "/*"