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

finish the merge

Browse source
This commit is contained in:
Kopper 2024-07-15 20:46:20 +03:00
commit 65f5a3cfb9
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import type { AxiosResponse, Method, RawAxiosRequestHeaders } from 'axios';
import axios from 'axios'; import axios from 'axios';
import LinkHeader from 'http-link-header'; import LinkHeader from 'http-link-header';
import { getAccessToken } from './initial_state'; import { getAccessToken, getBaseUrl } from './initial_state';
import ready from './ready'; import ready from './ready';
export const getLinks = (response: AxiosResponse) => { export const getLinks = (response: AxiosResponse) => {
@ -39,11 +39,6 @@ const authorizationTokenFromInitialState = (): RawAxiosRequestHeaders => {
}; };
}; };
const baseUrlFromState = (getState?: GetState) => {
const baseUrl = getState && getState().meta.get('base_url');
return `${baseUrl}`;
};
// eslint-disable-next-line import/no-default-export // eslint-disable-next-line import/no-default-export
export default function api(withAuthorization = true) { export default function api(withAuthorization = true) {
return axios.create({ return axios.create({
@ -52,7 +47,7 @@ export default function api(withAuthorization = true) {
...(withAuthorization ? authorizationTokenFromInitialState() : {}), ...(withAuthorization ? authorizationTokenFromInitialState() : {}),
}, },
baseURL: baseUrlFromState(getState), baseURL: getBaseUrl(),
transformResponse: [ transformResponse: [
function (data: unknown) { function (data: unknown) {

7
app/javascript/flavours/glitch/initial_state.js
View file

@ -161,4 +161,11 @@ export function getAccessToken() {
// Standalone-specific settings // Standalone-specific settings
export const isSingleColumn = !forceSingleColumn && (initialState?.local_settings?.single_column ?? !hasMultiColumnPath); export const isSingleColumn = !forceSingleColumn && (initialState?.local_settings?.single_column ?? !hasMultiColumnPath);
/**
* @returns {string | undefined}
*/
export function getBaseUrl() {
return getMeta('base_url');
}
export default initialState; export default initialState;