Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Im 520 error requesting groups #219

Merged
merged 7 commits into from
Jan 15, 2025
Merged

Im 520 error requesting groups #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6d48e1
test: Testing error /ui
kristinaBc3 Jan 8, 2025
05b83ac
Delete duplicated keycloak dependency from pom
kristinaBc3 Jan 9, 2025
b3c9f0a
IM-512 fix: Avoid error when refreshing a page
kristinaBc3 Jan 9, 2025
54b5fd4
Merge branch 'hub-ui-error-test-branch' into IM-518-Error-in-k.hub-wh…
kristinaBc3 Jan 9, 2025
3ee9c8a
Merge remote-tracking branch 'origin/develop' into IM-518-Error-in-k.…
kristinaBc3 Jan 9, 2025
957e437
Merge branch 'IM-518-Error-in-k.hub-when-refreshing-a-page' into IM-5…
kristinaBc3 Jan 10, 2025
7084050
Merge branch 'develop' into IM-520-Error-requesting-groups
kristinaBc3 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions klab.hub/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,6 @@
<version>1.34.0</version>
</dependency>
<!-- ////////////////////////////////////////////////////////////////// -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-boot-starter</artifactId>
<version>19.0.2</version>
</dependency>

<!--Dependencies for the unit tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
9 changes: 3 additions & 6 deletions klab.hub/src/main/java/org/integratedmodelling/klab/hub/controllers/FrontEndController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;

@Controller
@RequestMapping("/")
public class FrontEndController {

@GetMapping("/")
public ModelAndView home() {
ModelAndView home = new ModelAndView();
home.setViewName("/ui/index.html");
return home;
@GetMapping({"/ui","/ui/{path:[^\\.]+}", "/ui/**/{path:[^\\.]+}"}) // Everything without point (something.smt is served as is)
public String forward() {
return "forward:/ui/index.html";
}
}
2 changes: 1 addition & 1 deletion .../resources/static/ui/css/app.d2a88fe9.css → .../resources/static/ui/css/app.602cd4f9.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion klab.hub/src/main/resources/static/ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!DOCTYPE html><html><head><base href=/hub/ui/ ><title>k.Hub</title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=khub-logo.png><link rel=icon type=image/ico href=favicon.ico><link rel=apple-touch-icon sizes=57x57 href=icons/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=icons/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=icons/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=icons/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=icons/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=icons/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=icons/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=icons/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=icons/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=icons/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=manifest href=icons/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=icons/ms-icon-144x144.png><meta name=theme-color content=#ffffff><script>var environmentPath = "false" === "true" ? "/environments" : "./environments";
document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.d2a88fe9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.79b52333.js></script></body></html>
document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.602cd4f9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.7aa7cd8a.js></script></body></html>
1 change: 1 addition & 0 deletions klab.hub/src/main/resources/static/ui/js/app.7aa7cd8a.js
View file
Open in desktop

Large diffs are not rendered by default.