Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 0 additions & 1 deletion app/frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<link rel="shortcut icon" href="favicon.ico" />
<link rel="manifest" href="manifest.json" />
<title>Presentation Rules Editor app</title>
</head>

Expand Down
2 changes: 1 addition & 1 deletion app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"react-dom": "^18.3.1",
"react-error-boundary": "^4.1.2 ",
"react-redux": "^7.2.9",
"react-router-dom": "^7.0.2",
"react-router": "^7.1.5",
"redux": "^4.2.1",
"sass": "^1.82.0",
"tslib": "^2.8.1",
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "@itwin/itwinui-layouts-css/styles.css";
import "@itwin/itwinui-react/styles.css";
import "./App.scss";
import * as React from "react";
import { Navigate, Route, Routes, useNavigate } from "react-router-dom";
import { Navigate, Route, Routes, useNavigate } from "react-router";
import { SvgDeveloper, SvgFolderOpened } from "@itwin/itwinui-icons-react";
import { PageLayout } from "@itwin/itwinui-layouts-react";
import { Footer, SidenavButton, SideNavigation, ThemeProvider } from "@itwin/itwinui-react";
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/Authorization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { User, UserManager, WebStorageStateStore } from "oidc-client-ts";
import * as React from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { AccessToken } from "@itwin/core-bentley";
import { AuthorizationClient } from "@itwin/core-common";
import { PageLayout } from "@itwin/itwinui-layouts-react";
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/IModelBrowser/IModelBrowser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import "./IModelBrowser.scss";
import * as React from "react";
import { Outlet, useMatch, useNavigate } from "react-router-dom";
import { Outlet, useMatch, useNavigate } from "react-router";
import { AuthorizationClient } from "@itwin/core-common";
import { SvgHistory, SvgImodel, SvgList, SvgSearch, SvgThumbnails } from "@itwin/itwinui-icons-react";
import { FluidGrid, Grid, PageLayout } from "@itwin/itwinui-layouts-react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import * as React from "react";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate, useParams } from "react-router";
import { assert } from "@itwin/core-bentley";
import { AuthorizationClient } from "@itwin/core-common";
import { SvgImodelHollow, SvgProject } from "@itwin/itwinui-icons-react";
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/ITwinJsApp/ITwinJsApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export async function initializeApp(): Promise<BackendApi> {
RpcConfiguration.disableRoutingValidation = import.meta.env.DEPLOYMENT_TYPE !== "web";
const rpcParams =
import.meta.env.DEPLOYMENT_TYPE === "web"
? { info: { title: "visualization", version: "v4.0" } }
? { info: { title: "imodel/rpc", version: "v4" } }
: {
info: { title: "presentation-rules-editor", version: "v1.0" },
uriPrefix: "http://localhost:3001",
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/ITwinJsApp/InitializedApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function useIModel(

IModelApp.authorizationClient = authorizationClient;
if (import.meta.env.DEPLOYMENT_TYPE === "web") {
const backendUrl = "https://api.bentley.com/imodeljs";
const backendUrl = "https://api.bentley.com";
// eslint-disable-next-line @itwin/no-internal
backendApi.protocol.pathPrefix = isDemoIModel(iModelIdentifier) ? backendUrl : applyUrlPrefix(backendUrl);
}
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/OpenIModel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import * as React from "react";
import { Navigate, useNavigate, useSearchParams } from "react-router-dom";
import { Navigate, useNavigate, useSearchParams } from "react-router";
import { AuthorizationClient } from "@itwin/core-common";
import { SvgHome, SvgUser } from "@itwin/itwinui-icons-react";
import { HeaderButton, Tile } from "@itwin/itwinui-react";
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/app/errors/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import "./ErrorPage.scss";
import * as React from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { SvgError } from "@itwin/itwinui-illustrations-react";
import { PageLayout } from "@itwin/itwinui-layouts-react";
import { Button, ExpandableBlock, Text } from "@itwin/itwinui-react";
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "./index.scss";
import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
import { createRoot } from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import { BrowserRouter } from "react-router";
import { App } from "./app/App.js";

// setup environment for monaco editor
Expand Down
25 changes: 6 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading