mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 05:23:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

complete the merge

Browse source
This commit is contained in:
ShittyKopper 2024-05-06 04:48:46 +03:00
commit c1a1050835
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/flavours/glitch/api.ts
View file

@ -47,6 +47,11 @@ const authorizationHeaderFromState = (getState?: GetState) => {
} as RawAxiosRequestHeaders;
};
const baseUrlFromState = (getState?: GetState) => {
const baseUrl = getState && getState().meta.get('base_url');
return `${baseUrl}`;
};
// eslint-disable-next-line import/no-default-export
export default function api(getState: GetState) {
return axios.create({
@ -55,6 +60,8 @@ export default function api(getState: GetState) {
...authorizationHeaderFromState(getState),
},
baseURL: baseUrlFromState(getState),
transformResponse: [
function (data: unknown) {
try {

7
app/javascript/flavours/glitch/components/router.tsx
View file

@ -23,7 +23,6 @@ type LocationState = MastodonLocationState | null | undefined;
type HistoryPath = Path | LocationDescriptor<LocationState>;
const browserHistory = createBrowserHistory<LocationState>();
const originalPush = browserHistory.push.bind(browserHistory);
const originalReplace = browserHistory.replace.bind(browserHistory);
export function useAppHistory() {
@ -49,11 +48,7 @@ function normalizePath(
);
}
if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) {
originalPush(`/deck${path}`, state);
} else {
originalPush(path, state);
}
return location;
}
browserHistory.replace = (path: HistoryPath, state?: MastodonLocationState) => {

1
package.json
View file

@ -10,6 +10,7 @@
"streaming"
],
"scripts": {
"watch": "cross-env NODE_ENV=development webpack --config config/webpack/development.js --watch",
"build:development": "cross-env NODE_ENV=development webpack --config config/webpack/development.js",
"build:production": "cross-env NODE_ENV=production webpack --config config/webpack/production.js",
"build": "cross-env NODE_ENV=production webpack --config config/webpack/production.js",

19
public/index.html
View file

@ -9,22 +9,19 @@
<meta name="theme-color" content="#282c37" />
<meta content='/getting-started' name='initialPath' />
<link rel='preload' as='script' href='/packs/js/locales/glitch/en-json.js' />
<link rel='preload' as='script' href='/packs/js/flavours/glitch/async/getting_started.js' />
<link rel='preload' as='script' href='/packs/js/flavours/glitch/async/compose.js' />
<link rel='preload' as='script' href='/packs/js/flavours/glitch/async/home_timeline.js' />
<link rel='preload' as='script' href='/packs/js/flavours/glitch/async/notifications.js' />
<script id='initial-state' type='application/json'>{}</script>
<link rel="stylesheet" href="/packs/css/core/common.css" />
<link rel="stylesheet" href="/packs/css/flavours/glitch/common.css" />
<link rel="stylesheet" href="/packs/css/skins/glitch/modern-dark.css" />
<link rel="stylesheet" href="/packs/css/flavours/glitch/inert.css" />
<script src="/verify-state.js"></script>
<script src="/packs/js/common.js"></script>
<script src="/packs/js/core/common.js"></script>
<link rel="stylesheet" media="all" href="/packs/css/core/common.css" />
<script src="/packs/js/locales/glitch/en-json.js"></script>
<script src="/packs/js/flavours/glitch/common.js"></script>
<link rel="stylesheet" media="all" href="/packs/css/flavours/glitch/common.css" />
<script src="/packs/js/flavours/glitch/home.js"></script>
<script src="/packs/js/flavours/glitch/application.js"></script>
</head>
<body class='app-body no-reduce-motion system-font'>
<div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>