Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
4rthem committed Dec 12, 2023
1 parent 25f24f9 commit efd494b
Show file tree
Hide file tree
Showing 19 changed files with 39 additions and 58 deletions.
2 changes: 1 addition & 1 deletion expose/client/src/component/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {DashboardMenu} from '@alchemy/react-ps';
import config from '../lib/config';
import config from '../config';
import {RouterProvider} from '@alchemy/navigation';
import {routes} from '../routes.ts';
import RouteProxy from './RouteProxy.tsx';
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/component/ConfigWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import config from '../lib/config';
import config from '../config';
import FullPageLoader from './FullPageLoader';
import apiClient from '../lib/api-client';
import Root from './Root.tsx';
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/component/Layout.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {PureComponent} from 'react';
// import { PropTypes } from 'prop-types'
import {Link} from '@alchemy/navigation';
import config from '../lib/config';
import config from '../config';
import {Logo} from './Logo';
import {Trans} from 'react-i18next';
import {keycloakClient} from '../lib/api-client';
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/component/Logo.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import config from '../lib/config';
import config from '../config';

export function Logo() {
const title = config.clientLogoAlt || 'Expose.';
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/component/Publication.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {PureComponent} from 'react';
import config from '../lib/config';
import config from '../config';
// import { PropTypes } from 'prop-types'
import {layouts} from './layouts';
import ThemeEditorProxy from './themes/ThemeEditorProxy';
Expand Down
4 changes: 2 additions & 2 deletions expose/client/src/component/RouteProxy.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {MatomoRouteProxy} from '@alchemy/navigation';
import type {RouteProxyProps} from '@alchemy/navigation';
import {useAuth, useKeycloakUrls} from '@alchemy/react-auth';
import {keycloakClient} from '../lib/api-client.ts';
import config from '../lib/config.ts';
import {keycloakClient} from '../lib/api-client';
import config from '../config';

export default function RouteProxy({
component: Component,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
// import { PropTypes } from 'prop-types'
import mapboxgl from 'mapbox-gl';
import config from '../../../lib/config';
import config from '../../../config';
import Description from '../shared-components/Description';
import {getBrowserLanguage} from './browserLang';
import PublicationHeader from '../shared-components/PublicationHeader';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from '../../../lib/config';
import config from '../../../config';
import Description from './Description';
import ZippyDownloadButton from './ZippyDownloadButton';
import moment from 'moment';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from '../../lib/config';
import config from '../../config';
import {oauthClient} from '../../lib/api-client';
import FormLayout from './FormLayout';
import {useAuth} from '@alchemy/react-auth';
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/component/themes/ThemeEditorProxy.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import config from '../../lib/config';
import config from '../../config';

class ThemeEditorProxy extends Component {
state = {
Expand Down
19 changes: 19 additions & 0 deletions expose/client/src/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {WindowConfig} from '@alchemy/core'

declare global {
interface Window {
config: {
clientId: Readonly<string>;
requestSignatureTtl: Readonly<string>;
disableIndexPage?: Readonly<boolean>;
dashboardBaseUrl: Readonly<string>;
globalCSS: Readonly<string | undefined>;
zippyEnabled: Readonly<boolean | undefined>;
} & WindowConfig;
}
}

const config = window.config;
config.appName = 'expose';

export default config;
4 changes: 4 additions & 0 deletions expose/client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import ConfigWrapper from './component/ConfigWrapper';
import './i18n/i18n';
import AnalyticsProvider from './component/anaytics/AnalyticsProvider';
import React from 'react';
import config from "./config";
import {initSentry} from '@alchemy/core'

initSentry(config);

ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
Expand Down
2 changes: 1 addition & 1 deletion expose/client/src/lib/api-client.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {configureClientAuthentication, KeycloakClient} from '@alchemy/auth';
import {createHttpClient} from '@alchemy/api';
import config from './config';
import config from '../config';

export const keycloakClient = new KeycloakClient({
clientId: config.clientId,
Expand Down
32 changes: 0 additions & 32 deletions expose/client/src/lib/config.ts

This file was deleted.

2 changes: 1 addition & 1 deletion expose/client/src/lib/matomo.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {createInstance} from '@jonkoops/matomo-tracker-react';
import config from './config';
import config from '../config';

const analytics = config.analytics;

Expand Down
11 changes: 0 additions & 11 deletions expose/client/src/lib/oauth.js

This file was deleted.

2 changes: 1 addition & 1 deletion expose/client/src/routes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from './lib/config.ts';
import config from './config';
import PublicationIndex from './component/index/PublicationIndex.jsx';
import {compileRoutes} from '@alchemy/navigation';
import PublicationPage from './pages/PublicationPage.tsx';
Expand Down
1 change: 1 addition & 0 deletions uploader/client/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ declare global {
}

const config = window.config;
config.appName = 'uploader';

export default config;
2 changes: 1 addition & 1 deletion uploader/client/src/lib/apiClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {configureClientAuthentication, KeycloakClient} from '@alchemy/auth';
import {createHttpClient} from '@alchemy/api';
import config from './config';
import config from '../config';

export const keycloakClient = new KeycloakClient({
clientId: config.clientId,
Expand Down

0 comments on commit efd494b

Please sign in to comment.