diff --git a/backend/go-app/main.go b/backend/go-app/main.go index e6d27b19..cb1171b2 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -729,7 +729,7 @@ func handleRegister(resp http.ResponseWriter, request *http.Request) { if err != nil { if (countErr == nil && count > 0) || countErr != nil { resp.WriteHeader(401) - resp.Write([]byte(`{"success": false, "reason": "Can't register without being admin"}`)) + resp.Write([]byte(`{"success": false, "reason": "Users already exist. Please go to /login to log into your admin user."}`)) return } } @@ -6120,6 +6120,7 @@ func initHandlers() { r.HandleFunc("/api/v1/orgs/{orgId}/validate_app_values", shuffle.HandleKeyValueCheck).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/orgs/{orgId}/get_cache", shuffle.HandleGetCacheKey).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/orgs/{orgId}/set_cache", shuffle.HandleSetCacheKey).Methods("POST", "OPTIONS") + r.HandleFunc("/api/v1/orgs/{orgId}/stats", shuffle.HandleGetStatistics).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/apps/{key}/execute", executeSingleAction).Methods("POST", "OPTIONS") // Docker orborus specific - downloads an image diff --git a/docker-compose.yml b/docker-compose.yml index a3d676bd..d056c922 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: security_opt: - seccomp:unconfined opensearch: - image: opensearchproject/opensearch:2.3.0 + image: opensearchproject/opensearch:2.4.0 hostname: shuffle-opensearch container_name: shuffle-opensearch environment: diff --git a/frontend/public/images/social/shuffle_logo_round.png b/frontend/public/images/social/shuffle_logo_round.png new file mode 100644 index 00000000..61c7f660 Binary files /dev/null and b/frontend/public/images/social/shuffle_logo_round.png differ diff --git a/frontend/public/images/welcome_cog.png b/frontend/public/images/welcome_cog.png new file mode 100644 index 00000000..c3eef260 Binary files /dev/null and b/frontend/public/images/welcome_cog.png differ diff --git a/frontend/run.sh b/frontend/run.sh index d659fd64..0ba2beea 100755 --- a/frontend/run.sh +++ b/frontend/run.sh @@ -6,6 +6,7 @@ docker rm shuffle-frontend echo "Running build for website" #sudo npm run build docker build . -t ghcr.io/frikky/shuffle-frontend:nightly +docker tag ghcr.io/frikky/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:nightly echo "Starting server" # Rerun build locally for it to update :) diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js index 92f1d5a1..6aee8626 100644 --- a/frontend/src/components/Header.js +++ b/frontend/src/components/Header.js @@ -180,6 +180,8 @@ const Header = (props) => { org_id: orgId, }; + localStorage.setItem("getting_started_sidebar", "open"); + fetch(`${globalUrl}/api/v1/orgs/${orgId}/change`, { mode: "cors", method: "POST",