Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix] Fix linter issues (#85)

Browse Source 
- [x] .js
- [x] .json
- [x] .md
- [x] .scss
- [x] .yml

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/85
Co-authored-by: Zoë Bijl <code@moiety.me>
Co-committed-by: Zoë Bijl <code@moiety.me>
This commit is contained in:
Zoë Bijl
2025-10-09 11:11:42 +02:00
committed by tobi
parent 8a26776492
commit adf075d19f
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.woodpecker/lint.yaml
View File

@@ -2,22 +2,22 @@ steps:
lint: lint:
image: node:22-alpine image: node:22-alpine
pull: true pull: true
# https://woodpecker-ci.org/docs/usage/volumes # https://woodpecker-ci.org/docs/usage/volumes
volumes: volumes:
- /woodpecker/masto-fe-standalone/node_modules:/woodpecker/src/codeberg.org/superseriousbusiness/masto-fe-standalone/node_modules - /woodpecker/masto-fe-standalone/node_modules:/woodpecker/src/codeberg.org/superseriousbusiness/masto-fe-standalone/node_modules
- /woodpecker/masto-fe-standalone/.eslintcache:/woodpecker/src/codeberg.org/superseriousbusiness/masto-fe-standalone/.eslintcache - /woodpecker/masto-fe-standalone/.eslintcache:/woodpecker/src/codeberg.org/superseriousbusiness/masto-fe-standalone/.eslintcache
# https://woodpecker-ci.org/docs/administration/configuration/backends/docker#run-user # https://woodpecker-ci.org/docs/administration/configuration/backends/docker#run-user
backend_options: backend_options:
docker: docker:
user: 1000:1000 user: 1000:1000
# https://woodpecker-ci.org/docs/usage/workflow-syntax#commands # https://woodpecker-ci.org/docs/usage/workflow-syntax#commands
commands: commands:
- yarn - yarn
- yarn lint:js - yarn lint:js
# https://woodpecker-ci.org/docs/usage/workflow-syntax#when---conditional-execution # https://woodpecker-ci.org/docs/usage/workflow-syntax#when---conditional-execution
when: when:
- event: pull_request - event: pull_request

11
app/javascript/flavours/glitch/actions/server.js
View File

@@ -21,17 +21,20 @@ export const fetchServer = () => (dispatch, getState) => {
dispatch(fetchServerRequest()); dispatch(fetchServerRequest());
/* global data */
try { try {
api(getState) api(getState)
.get('/api/v2/instance').then({ data }) .get('/api/v2/instance').then({ data }).catch(error => {
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); console.error(error);
dispatch(fetchServerSuccess(data)); });
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
dispatch(fetchServerSuccess(data));
} catch (e) { } catch (e) {
api(getState) api(getState)
.get('/api/v1/instance').then(({ data }) => { .get('/api/v1/instance').then(({ data }) => {
if (data.contact_account) dispatch(importFetchedAccount(data.contact_account)); if (data.contact_account) dispatch(importFetchedAccount(data.contact_account));
dispatch(fetchServerSuccess(data)); dispatch(fetchServerSuccess(data));
}).catch(err => dispatch(fetchServerFail(err))); }).catch(err => dispatch(fetchServerFail(err)));
} }
}; };

3
app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
View File

@@ -24,9 +24,8 @@ import CharacterCounter from 'flavours/glitch/features/compose/components/charac
import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress'; import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components'; import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components';
import Video, { getPointerPosition } from 'flavours/glitch/features/video'; import Video, { getPointerPosition } from 'flavours/glitch/features/video';
import { me } from 'flavours/glitch/initial_state'; import { me , maxMediaDescChars } from 'flavours/glitch/initial_state';
import { assetHost } from 'flavours/glitch/utils/config'; import { assetHost } from 'flavours/glitch/utils/config';
import { maxMediaDescChars } from 'flavours/glitch/initial_state';
import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose'; import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose';

6
app/javascript/flavours/glitch/styles/login.scss
View File

@@ -5,7 +5,7 @@
@import 'basics'; @import 'basics';
body { body {
font-family: ui-rounded, 'mastodon-font-sans-serif', sans-serif; font-family: ui-rounded, mastodon-font-sans-serif, sans-serif;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
} }
@@ -88,7 +88,7 @@ button {
input[type='text'] { input[type='text'] {
display: block; display: block;
marhing: 0; margin: 0;
padding: 15px; padding: 15px;
border: 1px solid lighten(#282c37, 7%); border: 1px solid lighten(#282c37, 7%);
border-radius: 4px; border-radius: 4px;
@@ -102,7 +102,7 @@ input[type='text'] {
} }
.content { .content {
padding: 20px 15px 20px; padding: 20px 15px;
border-radius: 4px; border-radius: 4px;
border: 1px solid lighten(#39404f, 7%); border: 1px solid lighten(#39404f, 7%);
color: #fff; color: #fff;

11
app/javascript/mastodon/actions/server.js
View File

@@ -17,17 +17,20 @@ export const fetchServer = () => (dispatch, getState) => {
dispatch(fetchServerRequest()); dispatch(fetchServerRequest());
/* global data */
try { try {
api(getState) api(getState)
.get('/api/v2/instance').then({ data }); .get('/api/v2/instance').then({ data }).catch(error => {
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account)); console.error(error);
dispatch(fetchServerSuccess(data)); });
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
dispatch(fetchServerSuccess(data));
} catch (e) { } catch (e) {
api(getState) api(getState)
.get('/api/v1/instance').then(({ data }) => { .get('/api/v1/instance').then(({ data }) => {
if (data.contact_account) dispatch(importFetchedAccount(data.contact_account)); if (data.contact_account) dispatch(importFetchedAccount(data.contact_account));
dispatch(fetchServerSuccess(data)); dispatch(fetchServerSuccess(data));
}).catch(err => dispatch(fetchServerFail(err))); }).catch(err => dispatch(fetchServerFail(err)));
} }
}; };

3
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View File

@@ -23,9 +23,8 @@ import Audio from 'mastodon/features/audio';
import CharacterCounter from 'mastodon/features/compose/components/character_counter'; import CharacterCounter from 'mastodon/features/compose/components/character_counter';
import UploadProgress from 'mastodon/features/compose/components/upload_progress'; import UploadProgress from 'mastodon/features/compose/components/upload_progress';
import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components'; import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
import { me } from 'mastodon/initial_state'; import { me , maxMediaDescChars } from 'mastodon/initial_state';
import { assetHost } from 'mastodon/utils/config'; import { assetHost } from 'mastodon/utils/config';
import { maxMediaDescChars } from 'mastodon/initial_state';
import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose'; import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose';
import Video, { getPointerPosition } from '../../video'; import Video, { getPointerPosition } from '../../video';