Compare commits
33 commits
Author | SHA1 | Date | |
---|---|---|---|
1a17c08c4e | |||
682eed8ce6 | |||
77bd94519e | |||
7cc6c35654 | |||
228679e49e | |||
|
d610a46c32 | ||
|
0925763267 | ||
|
e292af4211 | ||
|
4e7d5d3a08 | ||
|
f2d0c4c7d5 | ||
|
02a6591f20 | ||
|
94c70f8914 | ||
|
3ba8c90e1e | ||
|
83db80f88c | ||
|
1489d92997 | ||
|
db5c9572dc | ||
|
5bb53c8b0d | ||
|
665f88f5c7 | ||
e7a558a533 | |||
5106fcedd6 | |||
1db322bae6 | |||
e530c2b462 | |||
9aa64d82c9 | |||
85abc62213 | |||
8569b5946e | |||
9c9b4cc07c | |||
2c9b73646c | |||
80a519d7e4 | |||
975f04bf5a | |||
c8c8d40827 | |||
d7499a1f91 | |||
5972d89117 | |||
d03872d598 |
123 changed files with 5682 additions and 6899 deletions
2
.eslintignore
Normal file
2
.eslintignore
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
build/*.js
|
||||||
|
config/*.js
|
30
.eslintrc.js
Normal file
30
.eslintrc.js
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
module.exports = {
|
||||||
|
root: true,
|
||||||
|
parserOptions: {
|
||||||
|
parser: '@babel/eslint-parser',
|
||||||
|
sourceType: 'module'
|
||||||
|
},
|
||||||
|
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
|
||||||
|
extends: [
|
||||||
|
'plugin:vue/recommended'
|
||||||
|
],
|
||||||
|
// required to lint *.vue files
|
||||||
|
plugins: [
|
||||||
|
'vue',
|
||||||
|
'import'
|
||||||
|
],
|
||||||
|
// add your custom rules here
|
||||||
|
rules: {
|
||||||
|
// allow paren-less arrow functions
|
||||||
|
'arrow-parens': 0,
|
||||||
|
// allow async-await
|
||||||
|
'generator-star-spacing': 0,
|
||||||
|
// allow debugger during development
|
||||||
|
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
|
||||||
|
'vue/require-prop-types': 0,
|
||||||
|
'vue/no-unused-vars': 0,
|
||||||
|
'no-tabs': 0,
|
||||||
|
'vue/multi-word-component-names': 0,
|
||||||
|
'vue/no-reserved-component-names': 0
|
||||||
|
}
|
||||||
|
}
|
1
.node-version
Normal file
1
.node-version
Normal file
|
@ -0,0 +1 @@
|
||||||
|
7.2.1
|
|
@ -1 +0,0 @@
|
||||||
nodejs 20.12.2
|
|
|
@ -1,25 +1,24 @@
|
||||||
labels:
|
platform: linux/amd64
|
||||||
platform: linux/amd64
|
pipeline:
|
||||||
|
|
||||||
steps:
|
|
||||||
lint:
|
lint:
|
||||||
when:
|
when:
|
||||||
event:
|
event:
|
||||||
- pull_request
|
- pull_request
|
||||||
image: node:20
|
image: node:18
|
||||||
commands:
|
commands:
|
||||||
- yarn
|
- yarn
|
||||||
- yarn lint
|
- yarn lint
|
||||||
|
#- yarn stylelint
|
||||||
|
|
||||||
test:
|
test:
|
||||||
when:
|
when:
|
||||||
event:
|
event:
|
||||||
- pull_request
|
- pull_request
|
||||||
image: node:20
|
image: node:18
|
||||||
commands:
|
commands:
|
||||||
- apt update
|
- apt update
|
||||||
- apt install firefox-esr -y --no-install-recommends
|
- apt install firefox-esr -y --no-install-recommends
|
||||||
- yarn
|
- yarn
|
||||||
- yarn unit
|
- yarn unit
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
@ -29,7 +28,7 @@ steps:
|
||||||
branch:
|
branch:
|
||||||
- develop
|
- develop
|
||||||
- stable
|
- stable
|
||||||
image: node:20
|
image: node:18
|
||||||
commands:
|
commands:
|
||||||
- yarn
|
- yarn
|
||||||
- yarn build
|
- yarn build
|
||||||
|
@ -41,15 +40,15 @@ steps:
|
||||||
branch:
|
branch:
|
||||||
- develop
|
- develop
|
||||||
- stable
|
- stable
|
||||||
image: node:20
|
image: node:18
|
||||||
secrets:
|
secrets:
|
||||||
- SCW_ACCESS_KEY
|
- SCW_ACCESS_KEY
|
||||||
- SCW_SECRET_KEY
|
- SCW_SECRET_KEY
|
||||||
- SCW_DEFAULT_ORGANIZATION_ID
|
- SCW_DEFAULT_ORGANIZATION_ID
|
||||||
commands:
|
commands:
|
||||||
- apt-get update && apt-get install -y rclone wget zip
|
- apt-get update && apt-get install -y rclone wget zip
|
||||||
- wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
|
- wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
|
||||||
- mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
|
- mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
|
||||||
- chmod +x scaleway-cli
|
- chmod +x scaleway-cli
|
||||||
- ./scaleway-cli object config install type=rclone
|
- ./scaleway-cli object config install type=rclone
|
||||||
- zip akkoma-fe.zip -r dist
|
- zip akkoma-fe.zip -r dist
|
||||||
|
@ -71,8 +70,8 @@ steps:
|
||||||
- SCW_DEFAULT_ORGANIZATION_ID
|
- SCW_DEFAULT_ORGANIZATION_ID
|
||||||
commands:
|
commands:
|
||||||
- apt-get update && apt-get install -y rclone wget git zip
|
- apt-get update && apt-get install -y rclone wget git zip
|
||||||
- wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
|
- wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
|
||||||
- mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
|
- mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
|
||||||
- chmod +x scaleway-cli
|
- chmod +x scaleway-cli
|
||||||
- ./scaleway-cli object config install type=rclone
|
- ./scaleway-cli object config install type=rclone
|
||||||
- cd docs
|
- cd docs
|
||||||
|
@ -80,4 +79,4 @@ steps:
|
||||||
- mkdocs build
|
- mkdocs build
|
||||||
- zip -r docs.zip site/*
|
- zip -r docs.zip site/*
|
||||||
- cd site
|
- cd site
|
||||||
- rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/
|
- rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/
|
||||||
|
|
|
@ -20,8 +20,6 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad
|
||||||
|
|
||||||
## Build Setup
|
## Build Setup
|
||||||
|
|
||||||
Make sure you have [Node.js](https://nodejs.org/) installed. You can check `/.woodpecker.yml` for which node version the Akkoma CI currently uses.
|
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
# install dependencies
|
# install dependencies
|
||||||
corepack enable
|
corepack enable
|
||||||
|
|
|
@ -1,36 +1,36 @@
|
||||||
// https://github.com/shelljs/shelljs
|
// https://github.com/shelljs/shelljs
|
||||||
require("./check-versions")();
|
require('./check-versions')()
|
||||||
require("shelljs/global");
|
require('shelljs/global')
|
||||||
env.NODE_ENV = "production";
|
env.NODE_ENV = 'production'
|
||||||
|
|
||||||
var path = require("path");
|
var path = require('path')
|
||||||
var config = require("../config");
|
var config = require('../config')
|
||||||
var webpack = require("webpack");
|
var ora = require('ora')
|
||||||
var webpackConfig = require("./webpack.prod.conf");
|
var webpack = require('webpack')
|
||||||
|
var webpackConfig = require('./webpack.prod.conf')
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
" Tip:\n" +
|
' Tip:\n' +
|
||||||
" Built files are meant to be served over an HTTP server.\n" +
|
' Built files are meant to be served over an HTTP server.\n' +
|
||||||
" Opening index.html over file:// won't work.\n",
|
' Opening index.html over file:// won\'t work.\n'
|
||||||
);
|
)
|
||||||
|
|
||||||
var assetsPath = path.join(
|
var spinner = ora('building for production...')
|
||||||
config.build.assetsRoot,
|
spinner.start()
|
||||||
config.build.assetsSubDirectory,
|
|
||||||
);
|
var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
|
||||||
rm("-rf", assetsPath);
|
rm('-rf', assetsPath)
|
||||||
mkdir("-p", assetsPath);
|
mkdir('-p', assetsPath)
|
||||||
cp("-R", "static/*", assetsPath);
|
cp('-R', 'static/*', assetsPath)
|
||||||
|
|
||||||
webpack(webpackConfig, function (err, stats) {
|
webpack(webpackConfig, function (err, stats) {
|
||||||
if (err) throw err;
|
spinner.stop()
|
||||||
process.stdout.write(
|
if (err) throw err
|
||||||
stats.toString({
|
process.stdout.write(stats.toString({
|
||||||
colors: true,
|
colors: true,
|
||||||
modules: false,
|
modules: false,
|
||||||
children: false,
|
children: false,
|
||||||
chunks: false,
|
chunks: false,
|
||||||
chunkModules: false,
|
chunkModules: false
|
||||||
}) + "\n",
|
}) + '\n')
|
||||||
);
|
})
|
||||||
});
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ var path = require('path')
|
||||||
var express = require('express')
|
var express = require('express')
|
||||||
var webpack = require('webpack')
|
var webpack = require('webpack')
|
||||||
var opn = require('opn')
|
var opn = require('opn')
|
||||||
const { createProxyMiddleware } = require('http-proxy-middleware');
|
var proxyMiddleware = require('http-proxy-middleware')
|
||||||
var webpackConfig = process.env.NODE_ENV === 'testing'
|
var webpackConfig = process.env.NODE_ENV === 'testing'
|
||||||
? require('./webpack.prod.conf')
|
? require('./webpack.prod.conf')
|
||||||
: require('./webpack.dev.conf')
|
: require('./webpack.dev.conf')
|
||||||
|
@ -36,13 +36,7 @@ Object.keys(proxyTable).forEach(function (context) {
|
||||||
if (typeof options === 'string') {
|
if (typeof options === 'string') {
|
||||||
options = { target: options }
|
options = { target: options }
|
||||||
}
|
}
|
||||||
const targetUrl = new URL(options.target);
|
app.use(proxyMiddleware(context, options))
|
||||||
// add path
|
|
||||||
targetUrl.pathname = context;
|
|
||||||
options.target = targetUrl.toString();
|
|
||||||
|
|
||||||
console.log("Proxying", context, "to", options.target);
|
|
||||||
app.use(context, createProxyMiddleware(options))
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// handle fallback for HTML5 history API
|
// handle fallback for HTML5 history API
|
||||||
|
|
|
@ -3,7 +3,6 @@ var config = require('../config')
|
||||||
var utils = require('./utils')
|
var utils = require('./utils')
|
||||||
var projectRoot = path.resolve(__dirname, '../')
|
var projectRoot = path.resolve(__dirname, '../')
|
||||||
var { VueLoaderPlugin } = require('vue-loader')
|
var { VueLoaderPlugin } = require('vue-loader')
|
||||||
const ESLintPlugin = require('eslint-webpack-plugin');
|
|
||||||
|
|
||||||
var env = process.env.NODE_ENV
|
var env = process.env.NODE_ENV
|
||||||
// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
|
// check env & config/index.js to decide weither to enable CSS Sourcemaps for the
|
||||||
|
@ -36,7 +35,6 @@ module.exports = {
|
||||||
],
|
],
|
||||||
fallback: {
|
fallback: {
|
||||||
"url": require.resolve("url/"),
|
"url": require.resolve("url/"),
|
||||||
querystring: require.resolve("querystring-es3")
|
|
||||||
},
|
},
|
||||||
alias: {
|
alias: {
|
||||||
'static': path.resolve(__dirname, '../static'),
|
'static': path.resolve(__dirname, '../static'),
|
||||||
|
@ -49,6 +47,20 @@ module.exports = {
|
||||||
module: {
|
module: {
|
||||||
noParse: /node_modules\/localforage\/dist\/localforage.js/,
|
noParse: /node_modules\/localforage\/dist\/localforage.js/,
|
||||||
rules: [
|
rules: [
|
||||||
|
{
|
||||||
|
enforce: 'pre',
|
||||||
|
test: /\.(js|vue)$/,
|
||||||
|
include: projectRoot,
|
||||||
|
exclude: /node_modules/,
|
||||||
|
use: {
|
||||||
|
loader: 'eslint-loader',
|
||||||
|
options: {
|
||||||
|
formatter: require('eslint-friendly-formatter'),
|
||||||
|
sourceMap: config.build.productionSourceMap,
|
||||||
|
extract: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
enforce: 'post',
|
enforce: 'post',
|
||||||
test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files
|
test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files
|
||||||
|
@ -106,9 +118,6 @@ module.exports = {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new VueLoaderPlugin(),
|
new VueLoaderPlugin()
|
||||||
new ESLintPlugin({
|
|
||||||
configType: 'flat'
|
|
||||||
})
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,5 @@ var { merge } = require('webpack-merge')
|
||||||
var devEnv = require('./dev.env')
|
var devEnv = require('./dev.env')
|
||||||
|
|
||||||
module.exports = merge(devEnv, {
|
module.exports = merge(devEnv, {
|
||||||
|
NODE_ENV: '"testing"'
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
const pluginVue = require('eslint-plugin-vue')
|
|
||||||
const pluginImport = require('eslint-plugin-import')
|
|
||||||
|
|
||||||
module.exports = [
|
|
||||||
...pluginVue.configs['flat/recommended'],
|
|
||||||
{
|
|
||||||
languageOptions: {
|
|
||||||
parserOptions: {
|
|
||||||
parser: '@babel/eslint-parser',
|
|
||||||
sourceType: 'module'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
// allow paren-less arrow functions
|
|
||||||
'arrow-parens': 0,
|
|
||||||
// allow async-await
|
|
||||||
'generator-star-spacing': 0,
|
|
||||||
// allow debugger during development
|
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
|
|
||||||
'vue/require-prop-types': 0,
|
|
||||||
'vue/no-unused-vars': 0,
|
|
||||||
'no-tabs': 0,
|
|
||||||
'vue/multi-word-component-names': 0,
|
|
||||||
'vue/no-reserved-component-names': 0
|
|
||||||
},
|
|
||||||
ignores: [
|
|
||||||
'build/*.js',
|
|
||||||
'config/*.js'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
164
package.json
164
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "pleroma_fe",
|
"name": "pleroma_fe",
|
||||||
"version": "3.10.0",
|
"version": "3.11.0",
|
||||||
"description": "A frontend for Akkoma instances",
|
"description": "A frontend for Akkoma instances",
|
||||||
"author": "Roger Braun <roger@rogerbraun.net>",
|
"author": "Roger Braun <roger@rogerbraun.net>",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
@ -12,118 +12,120 @@
|
||||||
"e2e": "node test/e2e/runner.js",
|
"e2e": "node test/e2e/runner.js",
|
||||||
"test": "npm run unit && npm run e2e",
|
"test": "npm run unit && npm run e2e",
|
||||||
"stylelint": "stylelint src/**/*.scss",
|
"stylelint": "stylelint src/**/*.scss",
|
||||||
"lint": "eslint src test/unit/specs test/e2e/specs",
|
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
|
||||||
"lint-fix": "eslint --fix src test/unit/specs test/e2e/specs"
|
"lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "7.17.8",
|
"@babel/runtime": "7.17.8",
|
||||||
"@chenfengyuan/vue-qrcode": "^2.0.0",
|
"@chenfengyuan/vue-qrcode": "2.0.0",
|
||||||
"@floatingghost/pinch-zoom-element": "^1.3.1",
|
"@floatingghost/pinch-zoom-element": "^1.3.1",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.2",
|
"@fortawesome/fontawesome-svg-core": "1.3.0",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.5.2",
|
"@fortawesome/free-regular-svg-icons": "^6.1.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.2",
|
"@fortawesome/free-solid-svg-icons": "^6.2.0",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.8",
|
"@fortawesome/vue-fontawesome": "3.0.1",
|
||||||
"@vuelidate/core": "^2.0.3",
|
"@vuelidate/core": "^2.0.0",
|
||||||
"@vuelidate/validators": "^2.0.4",
|
"@vuelidate/validators": "^2.0.0",
|
||||||
"blurhash": "^2.0.5",
|
"blurhash": "^2.0.4",
|
||||||
"body-scroll-lock": "^3.1.5",
|
"body-scroll-lock": "2.7.1",
|
||||||
"chromatism": "^3.0.0",
|
"chromatism": "3.0.0",
|
||||||
"click-outside-vue3": "^4.0.1",
|
"click-outside-vue3": "4.0.1",
|
||||||
"cropperjs": "^1.6.2",
|
"cropperjs": "1.5.12",
|
||||||
"diff": "^5.2.0",
|
"diff": "3.5.0",
|
||||||
"escape-html": "^1.0.3",
|
"escape-html": "1.0.3",
|
||||||
"iso-639-1": "^2.1.15",
|
"iso-639-1": "^2.1.15",
|
||||||
"js-cookie": "^3.0.1",
|
"js-cookie": "^3.0.1",
|
||||||
"localforage": "^1.10.0",
|
"localforage": "1.10.0",
|
||||||
"parse-link-header": "^2.0.0",
|
"parse-link-header": "^2.0.0",
|
||||||
"phoenix": "^1.7.12",
|
"phoenix": "1.6.2",
|
||||||
"punycode.js": "^2.3.1",
|
"punycode.js": "2.1.0",
|
||||||
"qrcode": "^1.5.3",
|
"qrcode": "1",
|
||||||
"querystring-es3": "^0.2.1",
|
"url": "^0.11.0",
|
||||||
"url": "^0.11.3",
|
"vue": "^3.2.31",
|
||||||
"vue": "^3.4.38",
|
"vue-i18n": "^9.2.2",
|
||||||
"vue-i18n": "^9.14.0",
|
"vue-router": "4.0.14",
|
||||||
"vue-router": "^4.4.3",
|
"vue-template-compiler": "2.6.11",
|
||||||
"vue-template-compiler": "^2.7.16",
|
"vuex": "4.0.2"
|
||||||
"vuex": "^4.1.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.24.6",
|
"@babel/core": "7.17.8",
|
||||||
"@babel/eslint-parser": "^7.19.1",
|
"@babel/eslint-parser": "^7.19.1",
|
||||||
"@babel/plugin-transform-runtime": "^7.24.6",
|
"@babel/plugin-transform-runtime": "7.17.0",
|
||||||
"@babel/preset-env": "^7.24.6",
|
"@babel/preset-env": "7.16.11",
|
||||||
"@babel/register": "^7.24.6",
|
"@babel/register": "7.17.7",
|
||||||
"@intlify/vue-i18n-loader": "^5.0.0",
|
"@intlify/vue-i18n-loader": "^5.0.0",
|
||||||
"@ungap/event-target": "^0.2.4",
|
"@ungap/event-target": "0.2.3",
|
||||||
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
|
"@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
|
||||||
"@vue/babel-plugin-jsx": "^1.2.2",
|
"@vue/babel-plugin-jsx": "1.1.1",
|
||||||
"@vue/compiler-sfc": "^3.1.0",
|
"@vue/compiler-sfc": "^3.1.0",
|
||||||
"@vue/test-utils": "^2.0.2",
|
"@vue/test-utils": "^2.0.2",
|
||||||
"autoprefixer": "^10.4.19",
|
"autoprefixer": "6.7.7",
|
||||||
"babel-loader": "^9.1.0",
|
"babel-loader": "^9.1.0",
|
||||||
"babel-plugin-lodash": "^3.3.4",
|
"babel-plugin-lodash": "3.3.4",
|
||||||
"chai": "^4.3.7",
|
"chai": "^4.3.7",
|
||||||
"chalk": "^1.1.3",
|
"chalk": "1.1.3",
|
||||||
"chromedriver": "^119.0.1",
|
"chromedriver": "^107.0.3",
|
||||||
"connect-history-api-fallback": "^2.0.0",
|
"connect-history-api-fallback": "^2.0.0",
|
||||||
"cross-spawn": "^7.0.3",
|
"cross-spawn": "^7.0.3",
|
||||||
"css-loader": "^7.1.2",
|
"css-loader": "^6.7.2",
|
||||||
"custom-event-polyfill": "^1.0.7",
|
"custom-event-polyfill": "^1.0.7",
|
||||||
"eslint": "^9.3.0",
|
"eslint": "^7.32.0",
|
||||||
"eslint-config-standard": "^17.1.0",
|
"eslint-config-standard": "^17.0.0",
|
||||||
"eslint-friendly-formatter": "^4.0.1",
|
"eslint-friendly-formatter": "^4.0.1",
|
||||||
"eslint-plugin-import": "^2.29.1",
|
"eslint-loader": "^4.0.2",
|
||||||
|
"eslint-plugin-import": "^2.26.0",
|
||||||
"eslint-plugin-node": "^11.1.0",
|
"eslint-plugin-node": "^11.1.0",
|
||||||
"eslint-plugin-promise": "^6.2.0",
|
"eslint-plugin-promise": "^6.1.1",
|
||||||
"eslint-plugin-standard": "^5.0.0",
|
"eslint-plugin-standard": "^5.0.0",
|
||||||
"eslint-plugin-vue": "^9.26.0",
|
"eslint-plugin-vue": "^9.7.0",
|
||||||
"eslint-webpack-plugin": "^4.2.0",
|
"eventsource-polyfill": "0.9.6",
|
||||||
"eventsource-polyfill": "^0.9.6",
|
"express": "4.17.3",
|
||||||
"express": "^4.19.2",
|
|
||||||
"file-loader": "^6.2.0",
|
"file-loader": "^6.2.0",
|
||||||
"function-bind": "^1.1.2",
|
"function-bind": "1.1.1",
|
||||||
"html-webpack-plugin": "^5.5.0",
|
"html-webpack-plugin": "^5.5.0",
|
||||||
"http-proxy-middleware": "^3.0.0",
|
"http-proxy-middleware": "0.21.0",
|
||||||
"json-loader": "^0.5.7",
|
"inject-loader": "2.0.1",
|
||||||
"karma": "^6.4.3",
|
"isparta-loader": "2.0.0",
|
||||||
"karma-coverage": "^2.2.1",
|
"json-loader": "0.5.7",
|
||||||
"karma-firefox-launcher": "^2.1.3",
|
"karma": "6.3.17",
|
||||||
"karma-mocha": "^2.0.1",
|
"karma-coverage": "1.1.2",
|
||||||
"karma-mocha-reporter": "^2.2.5",
|
"karma-firefox-launcher": "1.3.0",
|
||||||
"karma-sinon-chai": "^2.0.2",
|
"karma-mocha": "2.0.1",
|
||||||
"karma-sourcemap-loader": "^0.4.0",
|
"karma-mocha-reporter": "2.2.5",
|
||||||
"karma-spec-reporter": "^0.0.36",
|
"karma-sinon-chai": "2.0.2",
|
||||||
|
"karma-sourcemap-loader": "0.3.8",
|
||||||
|
"karma-spec-reporter": "0.0.33",
|
||||||
"karma-webpack": "^5.0.0",
|
"karma-webpack": "^5.0.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "4.17.21",
|
||||||
"lolex": "^6.0.0",
|
"lolex": "1.6.0",
|
||||||
"mini-css-extract-plugin": "^2.9.0",
|
"mini-css-extract-plugin": "0.12.0",
|
||||||
"mocha": "^10.4.0",
|
"mocha": "3.5.3",
|
||||||
"nightwatch": "^3.6.3",
|
"nightwatch": "0.9.21",
|
||||||
"opn": "^6.0.0",
|
"opn": "4.0.2",
|
||||||
|
"ora": "0.4.1",
|
||||||
"postcss-html": "^1.5.0",
|
"postcss-html": "^1.5.0",
|
||||||
"postcss-loader": "^8.1.1",
|
"postcss-loader": "3.0.0",
|
||||||
"postcss-sass": "^0.5.0",
|
"postcss-sass": "^0.5.0",
|
||||||
"raw-loader": "^4.0.2",
|
"raw-loader": "0.5.1",
|
||||||
"sass": "^1.77.2",
|
"sass": "^1.56.0",
|
||||||
"sass-loader": "^14.2.1",
|
"sass-loader": "^13.2.0",
|
||||||
"selenium-server": "^3.141.59",
|
"selenium-server": "2.53.1",
|
||||||
"semver": "^7.6.2",
|
"semver": "5.7.1",
|
||||||
"shelljs": "^0.8.5",
|
"shelljs": "0.8.5",
|
||||||
"sinon": "^18.0.0",
|
"sinon": "2.4.1",
|
||||||
"sinon-chai": "^3.7.0",
|
"sinon-chai": "2.14.0",
|
||||||
"stylelint": "^14.15.0",
|
"stylelint": "^14.15.0",
|
||||||
"stylelint-config-recommended-vue": "^1.4.0",
|
"stylelint-config-recommended-vue": "^1.4.0",
|
||||||
"stylelint-config-standard": "^29.0.0",
|
"stylelint-config-standard": "^29.0.0",
|
||||||
"stylelint-config-standard-scss": "^6.1.0",
|
"stylelint-config-standard-scss": "^6.1.0",
|
||||||
"stylelint-rscss": "^0.4.0",
|
"stylelint-rscss": "^0.4.0",
|
||||||
"url-loader": "^4.1.1",
|
"url-loader": "^4.1.1",
|
||||||
"vue-loader": "^17.4.2",
|
"vue-loader": "^17.0.0",
|
||||||
"vue-style-loader": "^4.1.3",
|
"vue-style-loader": "^4.1.2",
|
||||||
"webpack": "^5.91.0",
|
"webpack": "^5.75.0",
|
||||||
"webpack-dev-middleware": "^7.2.1",
|
"webpack-dev-middleware": "^5.3.3",
|
||||||
"webpack-hot-middleware": "^2.26.1",
|
"webpack-hot-middleware": "^2.25.1",
|
||||||
"webpack-merge": "^5.10.0",
|
"webpack-merge": "^5.8.0",
|
||||||
"workbox-webpack-plugin": "^7.1.0"
|
"workbox-webpack-plugin": "^6.5.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 16.0.0",
|
"node": ">= 16.0.0",
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./about.js"></script>
|
<script src="./about.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
:bound-to="{ x: 'container' }"
|
:bound-to="{ x: 'container' }"
|
||||||
remove-padding
|
remove-padding
|
||||||
>
|
>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<template v-if="relationship.following">
|
<template v-if="relationship.following">
|
||||||
<button
|
<button
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button class="button-unstyled ellipsis-button">
|
<button class="button-unstyled ellipsis-button">
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="icon"
|
class="icon"
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
keypath="user_card.block_confirm"
|
keypath="user_card.block_confirm"
|
||||||
tag="span"
|
tag="span"
|
||||||
>
|
>
|
||||||
<template #user>
|
<template v-slot:user>
|
||||||
<span
|
<span
|
||||||
v-text="user.screen_name_ui"
|
v-text="user.screen_name_ui"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -246,8 +246,8 @@
|
||||||
ref="flash"
|
ref="flash"
|
||||||
class="flash"
|
class="flash"
|
||||||
:src="attachment.large_thumb_url || attachment.url"
|
:src="attachment.large_thumb_url || attachment.url"
|
||||||
@player-opened="setFlashLoaded(true)"
|
@playerOpened="setFlashLoaded(true)"
|
||||||
@player-closed="setFlashLoaded(false)"
|
@playerClosed="setFlashLoaded(false)"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./avatar_list.js"></script>
|
<script src="./avatar_list.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -22,12 +22,12 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
|
emits: ['update:modelValue'],
|
||||||
props: [
|
props: [
|
||||||
'modelValue',
|
'modelValue',
|
||||||
'indeterminate',
|
'indeterminate',
|
||||||
'disabled'
|
'disabled'
|
||||||
],
|
]
|
||||||
emits: ['update:modelValue']
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
:model-value="present"
|
:model-value="present"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
class="opt"
|
class="opt"
|
||||||
@update:model-value="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
||||||
/>
|
/>
|
||||||
<div class="input color-input-field">
|
<div class="input color-input-field">
|
||||||
<input
|
<input
|
||||||
|
@ -46,6 +46,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
<style lang="scss" src="./color_input.scss"></style>
|
||||||
<script>
|
<script>
|
||||||
import Checkbox from '../checkbox/checkbox.vue'
|
import Checkbox from '../checkbox/checkbox.vue'
|
||||||
import { hex2rgb } from '../../services/color_convert/color_convert.js'
|
import { hex2rgb } from '../../services/color_convert/color_convert.js'
|
||||||
|
@ -107,7 +108,6 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" src="./color_input.scss"></style>
|
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.color-control {
|
.color-control {
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
</dialog-modal>
|
</dialog-modal>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./confirm_modal.js"></script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import '../../_variables';
|
@import '../../_variables';
|
||||||
|
|
||||||
|
@ -37,3 +35,5 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<script src="./confirm_modal.js"></script>
|
||||||
|
|
|
@ -267,11 +267,11 @@ const conversation = {
|
||||||
},
|
},
|
||||||
replies () {
|
replies () {
|
||||||
let i = 1
|
let i = 1
|
||||||
|
// eslint-disable-next-line camelcase
|
||||||
return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => {
|
return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => {
|
||||||
|
/* eslint-disable camelcase */
|
||||||
const irid = in_reply_to_status_id
|
const irid = in_reply_to_status_id
|
||||||
|
/* eslint-enable camelcase */
|
||||||
if (irid) {
|
if (irid) {
|
||||||
result[irid] = result[irid] || []
|
result[irid] = result[irid] || []
|
||||||
result[irid].push({
|
result[irid].push({
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
:controlled-set-media-playing="(newVal) => toggleStatusContentProperty(status.id, 'mediaPlaying', newVal)"
|
:controlled-set-media-playing="(newVal) => toggleStatusContentProperty(status.id, 'mediaPlaying', newVal)"
|
||||||
|
|
||||||
@goto="setHighlight"
|
@goto="setHighlight"
|
||||||
@toggle-expanded="toggleExpanded"
|
@toggleExpanded="toggleExpanded"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1"
|
v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1"
|
||||||
|
@ -184,7 +184,7 @@
|
||||||
:toggle-status-content-property="toggleStatusContentProperty"
|
:toggle-status-content-property="toggleStatusContentProperty"
|
||||||
|
|
||||||
@goto="setHighlight"
|
@goto="setHighlight"
|
||||||
@toggle-expanded="toggleExpanded"
|
@toggleExpanded="toggleExpanded"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -44,9 +44,9 @@
|
||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="publicTimelineVisible"
|
|
||||||
:to="{ name: 'public-timeline' }"
|
:to="{ name: 'public-timeline' }"
|
||||||
class="nav-icon"
|
class="nav-icon"
|
||||||
|
v-if="publicTimelineVisible"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
fixed-width
|
fixed-width
|
||||||
|
@ -68,9 +68,9 @@
|
||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="federatedTimelineVisible"
|
|
||||||
:to="{ name: 'public-external-timeline' }"
|
:to="{ name: 'public-external-timeline' }"
|
||||||
class="nav-icon"
|
class="nav-icon"
|
||||||
|
v-if="federatedTimelineVisible"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
fixed-width
|
fixed-width
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
>
|
>
|
||||||
{{ $t('domain_mute_card.unmute') }}
|
{{ $t('domain_mute_card.unmute') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('domain_mute_card.unmute_progress') }}
|
{{ $t('domain_mute_card.unmute_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
>
|
>
|
||||||
{{ $t('domain_mute_card.mute') }}
|
{{ $t('domain_mute_card.mute') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('domain_mute_card.mute_progress') }}
|
{{ $t('domain_mute_card.mute_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<Modal
|
<Modal
|
||||||
v-if="isFormVisible"
|
v-if="isFormVisible"
|
||||||
class="edit-form-modal-view"
|
class="edit-form-modal-view"
|
||||||
@backdrop-clicked="closeModal"
|
@backdropClicked="closeModal"
|
||||||
>
|
>
|
||||||
<div class="edit-form-modal-panel panel">
|
<div class="edit-form-modal-panel panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
@ -11,10 +11,10 @@
|
||||||
<PostStatusForm
|
<PostStatusForm
|
||||||
class="panel-body"
|
class="panel-body"
|
||||||
v-bind="params"
|
v-bind="params"
|
||||||
:disable-polls="true"
|
|
||||||
:disable-visibility-selector="true"
|
|
||||||
:post-handler="doEditStatus"
|
|
||||||
@posted="closeModal"
|
@posted="closeModal"
|
||||||
|
:disablePolls="true"
|
||||||
|
:disableVisibilitySelector="true"
|
||||||
|
:post-handler="doEditStatus"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
|
@ -43,10 +43,7 @@
|
||||||
:class="{ highlighted: index === highlighted }"
|
:class="{ highlighted: index === highlighted }"
|
||||||
@click.stop.prevent="onClick($event, suggestion)"
|
@click.stop.prevent="onClick($event, suggestion)"
|
||||||
>
|
>
|
||||||
<span
|
<span v-if="!suggestion.mfm" class="image">
|
||||||
v-if="!suggestion.mfm"
|
|
||||||
class="image"
|
|
||||||
>
|
|
||||||
<img
|
<img
|
||||||
v-if="suggestion.img"
|
v-if="suggestion.img"
|
||||||
:src="suggestion.img"
|
:src="suggestion.img"
|
||||||
|
|
|
@ -122,14 +122,14 @@ export const suggestUsers = ({ dispatch, state }) => {
|
||||||
const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
|
const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
|
||||||
|
|
||||||
return diff + nameAlphabetically + screenNameAlphabetically
|
return diff + nameAlphabetically + screenNameAlphabetically
|
||||||
|
/* eslint-disable camelcase */
|
||||||
}).map(({ screen_name, screen_name_ui, name, profile_image_url_original }) => ({
|
}).map(({ screen_name, screen_name_ui, name, profile_image_url_original }) => ({
|
||||||
displayText: screen_name_ui,
|
displayText: screen_name_ui,
|
||||||
detailText: name,
|
detailText: name,
|
||||||
imageUrl: profile_image_url_original,
|
imageUrl: profile_image_url_original,
|
||||||
replacement: '@' + screen_name + ' '
|
replacement: '@' + screen_name + ' '
|
||||||
}))
|
}))
|
||||||
|
/* eslint-enable camelcase */
|
||||||
|
|
||||||
suggestions = newSuggestions || []
|
suggestions = newSuggestions || []
|
||||||
return suggestions
|
return suggestions
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./emoji_reactions.js"></script>
|
<script src="./emoji_reactions.js" ></script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
:bound-to="{ x: 'container' }"
|
:bound-to="{ x: 'container' }"
|
||||||
remove-padding
|
remove-padding
|
||||||
>
|
>
|
||||||
<template #content="{close}">
|
<template v-slot:content="{close}">
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<button
|
<button
|
||||||
v-if="canMute && !status.thread_muted"
|
v-if="canMute && !status.thread_muted"
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button class="button-unstyled popover-trigger">
|
<button class="button-unstyled popover-trigger">
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="fa-scale-110 fa-old-padding"
|
class="fa-scale-110 fa-old-padding"
|
||||||
|
@ -205,7 +205,7 @@
|
||||||
</Popover>
|
</Popover>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./extra_buttons.js"></script>
|
<script src="./extra_buttons.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./favorite_button.js"></script>
|
<script src="./favorite_button.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./features_panel.js"></script>
|
<script src="./features_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.features-panel li {
|
.features-panel li {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<basic-user-card
|
<basic-user-card :user="user" v-if="show">
|
||||||
v-if="show"
|
|
||||||
:user="user"
|
|
||||||
>
|
|
||||||
<div class="follow-request-card-content-container">
|
<div class="follow-request-card-content-container">
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./font_control.js"></script>
|
<script src="./font_control.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
:description="descriptions && descriptions[attachment.id]"
|
:description="descriptions && descriptions[attachment.id]"
|
||||||
:hide-description="size === 'small' || tooManyAttachments && hidingLong"
|
:hide-description="size === 'small' || tooManyAttachments && hidingLong"
|
||||||
:style="itemStyle(attachment.id, row.items)"
|
:style="itemStyle(attachment.id, row.items)"
|
||||||
@set-media="onMedia"
|
@setMedia="onMedia"
|
||||||
@natural-size-load="onNaturalSizeLoad"
|
@naturalSizeLoad="onNaturalSizeLoad"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -14,6 +14,6 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./hashtag_link.js" />
|
<script src="./hashtag_link.js"/>
|
||||||
|
|
||||||
<style lang="scss" src="./hashtag_link.scss" />
|
<style lang="scss" src="./hashtag_link.scss"/>
|
||||||
|
|
|
@ -10,4 +10,4 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./instance_specific_panel.js"></script>
|
<script src="./instance_specific_panel.js" ></script>
|
||||||
|
|
|
@ -42,7 +42,6 @@ export default {
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
||||||
.list {
|
.list {
|
||||||
min-height: 1em;
|
|
||||||
&-item:not(:last-child) {
|
&-item:not(:last-child) {
|
||||||
border-bottom: 1px solid;
|
border-bottom: 1px solid;
|
||||||
border-bottom-color: $fallback--border;
|
border-bottom-color: $fallback--border;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<p>{{ $t("about.bubble_instances_description") }}:</p>
|
<p>{{ $t("about.bubble_instances_description")}}:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li
|
<li
|
||||||
v-for="instance in bubbleInstances"
|
v-for="instance in bubbleInstances"
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./login_form.js"></script>
|
<script src="./login_form.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<Modal
|
<Modal
|
||||||
v-if="showing"
|
v-if="showing"
|
||||||
class="media-modal-view"
|
class="media-modal-view"
|
||||||
@backdrop-clicked="hideIfNotSwiped"
|
@backdropClicked="hideIfNotSwiped"
|
||||||
>
|
>
|
||||||
<SwipeClick
|
<SwipeClick
|
||||||
v-if="type === 'image'"
|
v-if="type === 'image'"
|
||||||
|
|
|
@ -42,7 +42,7 @@ const mediaUpload = {
|
||||||
.then((fileData) => {
|
.then((fileData) => {
|
||||||
self.$emit('uploaded', fileData)
|
self.$emit('uploaded', fileData)
|
||||||
self.decreaseUploadCount()
|
self.decreaseUploadCount()
|
||||||
}, (error) => {
|
}, (error) => { // eslint-disable-line handle-callback-err
|
||||||
self.$emit('upload-failed', 'default')
|
self.$emit('upload-failed', 'default')
|
||||||
self.decreaseUploadCount()
|
self.decreaseUploadCount()
|
||||||
})
|
})
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</label>
|
</label>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./media_upload.js"></script>
|
<script src="./media_upload.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -66,6 +66,6 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./mention_link.js" />
|
<script src="./mention_link.js"/>
|
||||||
|
|
||||||
<style lang="scss" src="./mention_link.scss" />
|
<style lang="scss" src="./mention_link.scss"/>
|
||||||
|
|
|
@ -37,5 +37,5 @@
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<script src="./mentions_line.js"></script>
|
<script src="./mentions_line.js" ></script>
|
||||||
<style lang="scss" src="./mentions_line.scss" />
|
<style lang="scss" src="./mentions_line.scss" />
|
||||||
|
|
|
@ -69,4 +69,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script src="./recovery_form.js"></script>
|
<script src="./recovery_form.js" ></script>
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
<input
|
<input
|
||||||
id="code"
|
id="code"
|
||||||
v-model="code"
|
v-model="code"
|
||||||
autocomplete="one-time-code"
|
|
||||||
class="form-control"
|
class="form-control"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
class="panel-heading"
|
class="panel-heading"
|
||||||
@click="toggleHidden"
|
@click="toggleHidden"
|
||||||
>
|
>
|
||||||
<h4>{{ $t('moderation.reports.report') + ' ' + account.screen_name }}</h4>
|
<h4>{{ $t('moderation.reports.report') + ' ' + this.account.screen_name }}</h4>
|
||||||
<button
|
<button
|
||||||
v-if="isOpen"
|
v-if="isOpen"
|
||||||
class="button-default"
|
class="button-default"
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
class="button-default"
|
class="button-default"
|
||||||
@click.stop="updateReportState('open')"
|
@click.stop="updateReportState('open')"
|
||||||
>
|
>
|
||||||
{{ $t('moderation.reports.reopen') }}
|
{{ $t('moderation.reports.reopen') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
|
@ -35,10 +35,7 @@
|
||||||
<div v-if="content">
|
<div v-if="content">
|
||||||
{{ decode(content) }}
|
{{ decode(content) }}
|
||||||
</div>
|
</div>
|
||||||
<i
|
<i v-else class="faint">
|
||||||
v-else
|
|
||||||
class="faint"
|
|
||||||
>
|
|
||||||
{{ $t('moderation.reports.no_content') }}
|
{{ $t('moderation.reports.no_content') }}
|
||||||
</i>
|
</i>
|
||||||
<div class="report-author">
|
<div class="report-author">
|
||||||
|
@ -46,12 +43,12 @@
|
||||||
class="small-avatar"
|
class="small-avatar"
|
||||||
:user="actor"
|
:user="actor"
|
||||||
/>
|
/>
|
||||||
{{ actor.screen_name }}
|
{{ this.actor.screen_name }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="!hidden && statuses.length > 0"
|
|
||||||
class="dropdown"
|
class="dropdown"
|
||||||
|
v-if="!hidden && this.statuses.length > 0"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="button button-unstyled dropdown-header"
|
class="button button-unstyled dropdown-header"
|
||||||
|
@ -77,8 +74,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="!hidden && notes.length > 0"
|
|
||||||
class="dropdown"
|
class="dropdown"
|
||||||
|
v-if="!hidden && this.notes.length > 0"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="button button-unstyled dropdown-header"
|
class="button button-unstyled dropdown-header"
|
||||||
|
@ -102,9 +99,9 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="report-add-note">
|
<div class="report-add-note">
|
||||||
<textarea
|
<textarea
|
||||||
v-model.trim="note"
|
|
||||||
rows="1"
|
rows="1"
|
||||||
cols="1"
|
cols="1"
|
||||||
|
v-model.trim="note"
|
||||||
:placeholder="$t('moderation.reports.note_placeholder')"
|
:placeholder="$t('moderation.reports.note_placeholder')"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
|
@ -137,7 +134,7 @@
|
||||||
:offset="{ y: 5 }"
|
:offset="{ y: 5 }"
|
||||||
remove-padding
|
remove-padding
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
:disabled="!tagPolicyEnabled"
|
:disabled="!tagPolicyEnabled"
|
||||||
|
@ -150,7 +147,7 @@
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
<template #content="{close}">
|
<template v-slot:content="{close}">
|
||||||
<div
|
<div
|
||||||
class="dropdown-menu"
|
class="dropdown-menu"
|
||||||
:disabled="!tagPolicyEnabled"
|
:disabled="!tagPolicyEnabled"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
class="small-avatar"
|
class="small-avatar"
|
||||||
:user="user"
|
:user="user"
|
||||||
/>
|
/>
|
||||||
{{ user.screen_name }}
|
{{ this.user.screen_name }}
|
||||||
</div>
|
</div>
|
||||||
<div class="header-right">
|
<div class="header-right">
|
||||||
<Timeago
|
<Timeago
|
||||||
|
|
|
@ -22,9 +22,6 @@ export default {
|
||||||
default: false
|
default: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
emits: [
|
|
||||||
'backdropClicked',
|
|
||||||
],
|
|
||||||
computed: {
|
computed: {
|
||||||
classes () {
|
classes () {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
@show="setToggled(true)"
|
@show="setToggled(true)"
|
||||||
@close="setToggled(false)"
|
@close="setToggled(false)"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<span v-if="user.is_local">
|
<span v-if="user.is_local">
|
||||||
<button
|
<button
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button
|
<button
|
||||||
class="btn button-default btn-block moderation-tools-button"
|
class="btn button-default btn-block moderation-tools-button"
|
||||||
:class="{ toggled }"
|
:class="{ toggled }"
|
||||||
|
@ -137,11 +137,11 @@
|
||||||
v-if="showDeleteUserDialog"
|
v-if="showDeleteUserDialog"
|
||||||
:on-cancel="deleteUserDialog.bind(this, false)"
|
:on-cancel="deleteUserDialog.bind(this, false)"
|
||||||
>
|
>
|
||||||
<template #header>
|
<template v-slot:header>
|
||||||
{{ $t('user_card.admin_menu.delete_user') }}
|
{{ $t('user_card.admin_menu.delete_user') }}
|
||||||
</template>
|
</template>
|
||||||
<p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
|
<p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
|
||||||
<template #footer>
|
<template v-slot:footer>
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
@click="deleteUserDialog(false)"
|
@click="deleteUserDialog(false)"
|
||||||
|
|
|
@ -102,7 +102,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./nav_panel.js"></script>
|
<script src="./nav_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -6,7 +6,6 @@ import UserCard from '../user_card/user_card.vue'
|
||||||
import Timeago from '../timeago/timeago.vue'
|
import Timeago from '../timeago/timeago.vue'
|
||||||
import RichContent from 'src/components/rich_content/rich_content.jsx'
|
import RichContent from 'src/components/rich_content/rich_content.jsx'
|
||||||
import ConfirmModal from '../confirm_modal/confirm_modal.vue'
|
import ConfirmModal from '../confirm_modal/confirm_modal.vue'
|
||||||
import StillImage from '../still-image/still-image.vue'
|
|
||||||
import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
|
import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
|
||||||
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
|
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
|
||||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||||
|
@ -51,8 +50,7 @@ const Notification = {
|
||||||
Timeago,
|
Timeago,
|
||||||
Status,
|
Status,
|
||||||
RichContent,
|
RichContent,
|
||||||
ConfirmModal,
|
ConfirmModal
|
||||||
StillImage
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
toggleUserExpanded () {
|
toggleUserExpanded () {
|
||||||
|
|
|
@ -116,13 +116,12 @@
|
||||||
scope="global"
|
scope="global"
|
||||||
keypath="notifications.reacted_with"
|
keypath="notifications.reacted_with"
|
||||||
>
|
>
|
||||||
<still-image
|
<img
|
||||||
v-if="notification.emoji_url !== null"
|
v-if="notification.emoji_url !== null"
|
||||||
class="notification-reaction-emoji"
|
class="notification-reaction-emoji"
|
||||||
:src="notification.emoji_url"
|
:src="notification.emoji_url"
|
||||||
:title="notification.emoji"
|
:name="notification.emoji"
|
||||||
:alt="notification.emoji"
|
>
|
||||||
/>
|
|
||||||
<span
|
<span
|
||||||
v-else
|
v-else
|
||||||
class="emoji-reaction-emoji"
|
class="emoji-reaction-emoji"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
:bound-to="{ x: 'container' }"
|
:bound-to="{ x: 'container' }"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<button
|
<button
|
||||||
class="button-default dropdown-item"
|
class="button-default dropdown-item"
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button class="filter-trigger-button button-unstyled">
|
<button class="filter-trigger-button button-unstyled">
|
||||||
<FAIcon icon="filter" />
|
<FAIcon icon="filter" />
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
:model-value="present"
|
:model-value="present"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
class="opt"
|
class="opt"
|
||||||
@update:model-value="$emit('update:modelValue', !present ? fallback : undefined)"
|
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"
|
||||||
/>
|
/>
|
||||||
<input
|
<input
|
||||||
:id="name"
|
:id="name"
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<pinch-zoom
|
<pinch-zoom
|
||||||
class="pinch-zoom-parent"
|
class="pinch-zoom-parent"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
|
v-on="$listeners"
|
||||||
>
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</pinch-zoom>
|
</pinch-zoom>
|
||||||
|
|
|
@ -9,12 +9,11 @@ import StatusContent from '../status_content/status_content.vue'
|
||||||
import fileTypeService from '../../services/file_type/file_type.service.js'
|
import fileTypeService from '../../services/file_type/file_type.service.js'
|
||||||
import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
|
import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
|
||||||
import { reject, map, uniqBy, debounce } from 'lodash'
|
import { reject, map, uniqBy, debounce } from 'lodash'
|
||||||
import { usePostLanguageOptions } from 'src/lib/post_language'
|
|
||||||
import suggestor from '../emoji_input/suggestor.js'
|
import suggestor from '../emoji_input/suggestor.js'
|
||||||
import { mapGetters, mapState } from 'vuex'
|
import { mapGetters, mapState } from 'vuex'
|
||||||
import Checkbox from '../checkbox/checkbox.vue'
|
import Checkbox from '../checkbox/checkbox.vue'
|
||||||
import Select from '../select/select.vue'
|
import Select from '../select/select.vue'
|
||||||
|
import iso6391 from 'iso-639-1'
|
||||||
|
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import {
|
import {
|
||||||
|
@ -63,13 +62,6 @@ const deleteDraft = (draftKey) => {
|
||||||
localStorage.setItem('drafts', JSON.stringify(draftData));
|
localStorage.setItem('drafts', JSON.stringify(draftData));
|
||||||
}
|
}
|
||||||
|
|
||||||
const interfaceToISOLanguage = (ilang) => {
|
|
||||||
const sep = ilang.indexOf("_");
|
|
||||||
return sep < 0 ?
|
|
||||||
ilang :
|
|
||||||
ilang.substr(0, sep);
|
|
||||||
}
|
|
||||||
|
|
||||||
const PostStatusForm = {
|
const PostStatusForm = {
|
||||||
props: [
|
props: [
|
||||||
'statusId',
|
'statusId',
|
||||||
|
@ -137,13 +129,6 @@ const PostStatusForm = {
|
||||||
this.$refs.textarea.focus()
|
this.$refs.textarea.focus()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setup() {
|
|
||||||
const {postLanguageOptions} = usePostLanguageOptions()
|
|
||||||
|
|
||||||
return {
|
|
||||||
postLanguageOptions,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data () {
|
data () {
|
||||||
const preset = this.$route.query.message
|
const preset = this.$route.query.message
|
||||||
let statusText = preset || ''
|
let statusText = preset || ''
|
||||||
|
@ -153,8 +138,7 @@ const PostStatusForm = {
|
||||||
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
|
statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
|
||||||
}
|
}
|
||||||
|
|
||||||
const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
|
const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
|
||||||
const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
|
|
||||||
|
|
||||||
let statusParams = {
|
let statusParams = {
|
||||||
spoilerText: this.subject || '',
|
spoilerText: this.subject || '',
|
||||||
|
@ -165,7 +149,7 @@ const PostStatusForm = {
|
||||||
poll: {},
|
poll: {},
|
||||||
mediaDescriptions: {},
|
mediaDescriptions: {},
|
||||||
visibility: this.suggestedVisibility(),
|
visibility: this.suggestedVisibility(),
|
||||||
language: postLanguage,
|
language: interfaceLanguage,
|
||||||
contentType
|
contentType
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,7 +164,7 @@ const PostStatusForm = {
|
||||||
poll: this.statusPoll || {},
|
poll: this.statusPoll || {},
|
||||||
mediaDescriptions: this.statusMediaDescriptions || {},
|
mediaDescriptions: this.statusMediaDescriptions || {},
|
||||||
visibility: this.statusScope || this.suggestedVisibility(),
|
visibility: this.statusScope || this.suggestedVisibility(),
|
||||||
language: this.statusLanguage || postLanguage,
|
language: this.statusLanguage || interfaceLanguage,
|
||||||
contentType: statusContentType
|
contentType: statusContentType
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -325,6 +309,9 @@ const PostStatusForm = {
|
||||||
...mapState({
|
...mapState({
|
||||||
mobileLayout: state => state.interface.mobileLayout
|
mobileLayout: state => state.interface.mobileLayout
|
||||||
}),
|
}),
|
||||||
|
isoLanguages () {
|
||||||
|
return iso6391.getAllCodes();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'newStatus': {
|
'newStatus': {
|
||||||
|
|
|
@ -118,8 +118,8 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<EmojiInput
|
<EmojiInput
|
||||||
v-if="subjectVisible"
|
|
||||||
ref="subject-emoji-input"
|
ref="subject-emoji-input"
|
||||||
|
v-if="subjectVisible"
|
||||||
v-model="newStatus.spoilerText"
|
v-model="newStatus.spoilerText"
|
||||||
enable-emoji-picker
|
enable-emoji-picker
|
||||||
hide-emoji-button
|
hide-emoji-button
|
||||||
|
@ -170,7 +170,7 @@
|
||||||
cols="1"
|
cols="1"
|
||||||
:disabled="posting && !optimisticPosting"
|
:disabled="posting && !optimisticPosting"
|
||||||
class="form-post-body"
|
class="form-post-body"
|
||||||
:class="{ 'scrollable-form': !!maxHeight, '-has-subject': subjectVisible }"
|
:class="{ 'scrollable-form': !!maxHeight }"
|
||||||
@keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
|
@keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
|
||||||
@keydown.meta.enter="postStatus($event, newStatus)"
|
@keydown.meta.enter="postStatus($event, newStatus)"
|
||||||
@keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
|
@keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
|
||||||
|
@ -190,7 +190,6 @@
|
||||||
<div
|
<div
|
||||||
v-if="!disableScopeSelector"
|
v-if="!disableScopeSelector"
|
||||||
class="visibility-tray"
|
class="visibility-tray"
|
||||||
:class="{ 'visibility-tray-edit': isEdit }"
|
|
||||||
>
|
>
|
||||||
<scope-selector
|
<scope-selector
|
||||||
v-if="!disableVisibilitySelector"
|
v-if="!disableVisibilitySelector"
|
||||||
|
@ -201,50 +200,47 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="format-selector-container">
|
class="language-selector"
|
||||||
<div
|
|
||||||
class="format-selector"
|
|
||||||
>
|
|
||||||
<Select
|
|
||||||
id="post-language"
|
|
||||||
v-model="newStatus.language"
|
|
||||||
class="form-control"
|
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="language in postLanguageOptions"
|
|
||||||
:key="language.key"
|
|
||||||
:value="language.value"
|
|
||||||
>
|
|
||||||
{{ language.label }}
|
|
||||||
</option>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="postFormats.length > 1"
|
|
||||||
class="text-format format-selector"
|
|
||||||
>
|
>
|
||||||
<Select
|
<Select
|
||||||
id="post-content-type"
|
id="post-language"
|
||||||
v-model="newStatus.contentType"
|
v-model="newStatus.language"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="postFormat in postFormats"
|
|
||||||
:key="postFormat"
|
|
||||||
:value="postFormat"
|
|
||||||
>
|
|
||||||
{{ $t(`post_status.content_type["${postFormat}"]`) }}
|
|
||||||
</option>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
|
|
||||||
class="text-format format-selector"
|
|
||||||
>
|
>
|
||||||
<span class="only-format">
|
<option
|
||||||
{{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
|
v-for="language in isoLanguages"
|
||||||
</span>
|
:key="language"
|
||||||
</div>
|
:value="language"
|
||||||
|
>
|
||||||
|
{{ language }}
|
||||||
|
</option>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="postFormats.length > 1"
|
||||||
|
class="text-format"
|
||||||
|
>
|
||||||
|
<Select
|
||||||
|
id="post-content-type"
|
||||||
|
v-model="newStatus.contentType"
|
||||||
|
class="form-control"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
v-for="postFormat in postFormats"
|
||||||
|
:key="postFormat"
|
||||||
|
:value="postFormat"
|
||||||
|
>
|
||||||
|
{{ $t(`post_status.content_type["${postFormat}"]`) }}
|
||||||
|
</option>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
|
||||||
|
class="text-format"
|
||||||
|
>
|
||||||
|
<span class="only-format">
|
||||||
|
{{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -464,10 +460,6 @@
|
||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.visibility-tray-edit {
|
|
||||||
justify-content: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.visibility-notice.edit-warning {
|
.visibility-notice.edit-warning {
|
||||||
> :first-child {
|
> :first-child {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
|
@ -478,12 +470,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.format-selector-container {
|
|
||||||
.format-selector {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
|
.media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
|
||||||
font-size: 1.85em;
|
font-size: 1.85em;
|
||||||
line-height: 1.1;
|
line-height: 1.1;
|
||||||
|
@ -584,11 +570,6 @@
|
||||||
line-height: 1.85;
|
line-height: 1.85;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-post-subject {
|
|
||||||
border-bottom-left-radius: 0;
|
|
||||||
border-bottom-right-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-post-body {
|
.form-post-body {
|
||||||
// TODO: make a resizable textarea component?
|
// TODO: make a resizable textarea component?
|
||||||
box-sizing: content-box; // needed for easier computation of dynamic size
|
box-sizing: content-box; // needed for easier computation of dynamic size
|
||||||
|
@ -601,11 +582,6 @@
|
||||||
min-height: calc(var(--post-line-height) * 1em);
|
min-height: calc(var(--post-line-height) * 1em);
|
||||||
resize: none;
|
resize: none;
|
||||||
|
|
||||||
&.-has-subject {
|
|
||||||
border-top-left-radius: 0;
|
|
||||||
border-top-right-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.scrollable-form {
|
&.scrollable-form {
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
v-if="isLoggedIn && !resettingForm"
|
v-if="isLoggedIn && !resettingForm"
|
||||||
:is-open="modalActivated"
|
:is-open="modalActivated"
|
||||||
class="post-form-modal-view"
|
class="post-form-modal-view"
|
||||||
@backdrop-clicked="closeModal"
|
@backdropClicked="closeModal"
|
||||||
>
|
>
|
||||||
<div class="post-form-modal-panel panel">
|
<div class="post-form-modal-panel panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
remove-padding
|
remove-padding
|
||||||
@show="focusInput"
|
@show="focusInput"
|
||||||
>
|
>
|
||||||
<template #content="{close}">
|
<template v-slot:content="{close}">
|
||||||
<EmojiPicker
|
<EmojiPicker
|
||||||
:enable-sticker-picker="false"
|
:enable-sticker-picker="false"
|
||||||
@emoji="addReaction($event, close)"
|
@emoji="addReaction($event, close)"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button
|
<button
|
||||||
class="button-unstyled popover-trigger"
|
class="button-unstyled popover-trigger"
|
||||||
:title="$t('tool_tip.add_reaction')"
|
:title="$t('tool_tip.add_reaction')"
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
</Popover>
|
</Popover>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./react_button.js"></script>
|
<script src="./react_button.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -2,7 +2,7 @@ export default {
|
||||||
props: [ 'user' ],
|
props: [ 'user' ],
|
||||||
computed: {
|
computed: {
|
||||||
subscribeUrl () {
|
subscribeUrl () {
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
const serverUrl = new URL(this.user.statusnet_profile_url)
|
const serverUrl = new URL(this.user.statusnet_profile_url)
|
||||||
return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
|
return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./retweet_button.js"></script>
|
<script src="./retweet_button.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
:items="items"
|
:items="items"
|
||||||
:get-key="getKey"
|
:get-key="getKey"
|
||||||
>
|
>
|
||||||
<template #item="{item}">
|
<template v-slot:item="{item}">
|
||||||
<div
|
<div
|
||||||
class="selectable-list-item-inner"
|
class="selectable-list-item-inner"
|
||||||
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #empty>
|
<template v-slot:empty>
|
||||||
<slot name="empty" />
|
<slot name="empty" />
|
||||||
</template>
|
</template>
|
||||||
</List>
|
</List>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:model-value="state"
|
:model-value="state"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@update:model-value="update"
|
@update:modelValue="update"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
v-if="!!$slots.default"
|
v-if="!!$slots.default"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<Select
|
<Select
|
||||||
:model-value="state"
|
:model-value="state"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@update:model-value="update"
|
@update:modelValue="update"
|
||||||
>
|
>
|
||||||
<option
|
<option
|
||||||
v-for="option in options"
|
v-for="option in options"
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
<Popover
|
<Popover
|
||||||
trigger="hover"
|
trigger="hover"
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
|
|
||||||
<FAIcon
|
<FAIcon
|
||||||
icon="wrench"
|
icon="wrench"
|
||||||
:aria-label="$t('settings.setting_changed')"
|
:aria-label="$t('settings.setting_changed')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="modified-tooltip">
|
<div class="modified-tooltip">
|
||||||
{{ $t('settings.setting_changed') }}
|
{{ $t('settings.setting_changed') }}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
<Popover
|
<Popover
|
||||||
trigger="hover"
|
trigger="hover"
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
|
|
||||||
<FAIcon
|
<FAIcon
|
||||||
icon="server"
|
icon="server"
|
||||||
:aria-label="$t('settings.setting_server_side')"
|
:aria-label="$t('settings.setting_server_side')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="serverside-tooltip">
|
<div class="serverside-tooltip">
|
||||||
{{ $t('settings.setting_server_side') }}
|
{{ $t('settings.setting_server_side') }}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -69,7 +69,7 @@ const SettingsModal = {
|
||||||
this.$store.dispatch('closeSettingsModal')
|
this.$store.dispatch('closeSettingsModal')
|
||||||
},
|
},
|
||||||
logout () {
|
logout () {
|
||||||
this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
|
this.$router.replace('/main/public')
|
||||||
this.$store.dispatch('closeSettingsModal')
|
this.$store.dispatch('closeSettingsModal')
|
||||||
this.$store.dispatch('logout')
|
this.$store.dispatch('logout')
|
||||||
},
|
},
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:model-value="!!expertLevel"
|
:model-value="!!expertLevel"
|
||||||
class="expertMode"
|
class="expertMode"
|
||||||
@update:model-value="expertLevel = Number($event)"
|
@update:modelValue="expertLevel = Number($event)"
|
||||||
>
|
>
|
||||||
{{ $t("settings.expert_mode") }}
|
{{ $t("settings.expert_mode") }}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
|
|
|
@ -72,7 +72,7 @@ const DataImportExportTab = {
|
||||||
// check is it's a local user
|
// check is it's a local user
|
||||||
if (user && user.is_local) {
|
if (user && user.is_local) {
|
||||||
// append the instance address
|
// append the instance address
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
return user.screen_name + '@' + location.hostname
|
return user.screen_name + '@' + location.hostname
|
||||||
}
|
}
|
||||||
return user.screen_name
|
return user.screen_name
|
||||||
|
|
|
@ -4,7 +4,6 @@ import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
|
||||||
import IntegerSetting from '../helpers/integer_setting.vue'
|
import IntegerSetting from '../helpers/integer_setting.vue'
|
||||||
import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
|
import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
|
||||||
|
|
||||||
import { usePostLanguageOptions } from 'src/lib/post_language'
|
|
||||||
import SharedComputedObject from '../helpers/shared_computed_object.js'
|
import SharedComputedObject from '../helpers/shared_computed_object.js'
|
||||||
import ServerSideIndicator from '../helpers/server_side_indicator.vue'
|
import ServerSideIndicator from '../helpers/server_side_indicator.vue'
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
|
@ -18,11 +17,6 @@ library.add(
|
||||||
)
|
)
|
||||||
|
|
||||||
const GeneralTab = {
|
const GeneralTab = {
|
||||||
setup() {
|
|
||||||
const {postLanguageOptions} = usePostLanguageOptions()
|
|
||||||
|
|
||||||
return {postLanguageOptions}
|
|
||||||
},
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
|
subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
|
||||||
|
@ -124,12 +118,6 @@ const GeneralTab = {
|
||||||
this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
|
this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
postLanguage: {
|
|
||||||
get: function () { return this.$store.getters.mergedConfig.postLanguage },
|
|
||||||
set: function (val) {
|
|
||||||
this.$store.dispatch('setOption', { name: 'postLanguage', value: val })
|
|
||||||
}
|
|
||||||
},
|
|
||||||
...SharedComputedObject()
|
...SharedComputedObject()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
<template
|
<template
|
||||||
v-if="profilesExpanded"
|
v-if="profilesExpanded"
|
||||||
>
|
>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-for="profile in settingsProfiles"
|
v-for="profile in settingsProfiles"
|
||||||
:key="profile.id"
|
:key="profile.id"
|
||||||
|
@ -72,24 +73,15 @@
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button class="btn button-default" @click="refreshProfiles()">
|
||||||
class="btn button-default"
|
|
||||||
@click="refreshProfiles()"
|
|
||||||
>
|
|
||||||
{{ $t('settings.settings_profiles_refresh') }}
|
{{ $t('settings.settings_profiles_refresh') }}
|
||||||
<FAIcon
|
<FAIcon icon="sync" @click="refreshProfiles()" />
|
||||||
icon="sync"
|
|
||||||
@click="refreshProfiles()"
|
|
||||||
/>
|
|
||||||
</button>
|
</button>
|
||||||
<h3>{{ $t('settings.settings_profile_creation') }}</h3>
|
<h3>{{ $t('settings.settings_profile_creation') }}</h3>
|
||||||
<label for="settings-profile-new-name">
|
<label for="settings-profile-new-name">
|
||||||
{{ $t('settings.settings_profile_creation_new_name_label') }}
|
{{ $t('settings.settings_profile_creation_new_name_label') }}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input v-model="newProfileName" id="settings-profile-new-name">
|
||||||
id="settings-profile-new-name"
|
|
||||||
v-model="newProfileName"
|
|
||||||
>
|
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
@click="createSettingsProfile"
|
@click="createSettingsProfile"
|
||||||
|
@ -593,15 +585,6 @@
|
||||||
{{ $t('settings.post_status_content_type') }}
|
{{ $t('settings.post_status_content_type') }}
|
||||||
</ChoiceSetting>
|
</ChoiceSetting>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
|
||||||
<ChoiceSetting
|
|
||||||
id="postLanguage"
|
|
||||||
path="postLanguage"
|
|
||||||
:options="postLanguageOptions"
|
|
||||||
>
|
|
||||||
{{ $t('settings.post_language') }}
|
|
||||||
</ChoiceSetting>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<BooleanSetting
|
<BooleanSetting
|
||||||
path="alwaysShowNewPostButton"
|
path="alwaysShowNewPostButton"
|
||||||
|
|
|
@ -85,7 +85,7 @@ const MutesAndBlocks = {
|
||||||
// check is it's a local user
|
// check is it's a local user
|
||||||
if (user && user.is_local) {
|
if (user && user.is_local) {
|
||||||
// append the instance address
|
// append the instance address
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
return user.screen_name + '@' + location.hostname
|
return user.screen_name + '@' + location.hostname
|
||||||
}
|
}
|
||||||
return user.screen_name
|
return user.screen_name
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
:query="queryUserIds"
|
:query="queryUserIds"
|
||||||
:placeholder="$t('settings.search_user_to_block')"
|
:placeholder="$t('settings.search_user_to_block')"
|
||||||
>
|
>
|
||||||
<template #default="row">
|
<template v-slot="row">
|
||||||
<BlockCard
|
<BlockCard
|
||||||
:user-id="row.item"
|
:user-id="row.item"
|
||||||
/>
|
/>
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
:refresh="true"
|
:refresh="true"
|
||||||
:get-key="i => i"
|
:get-key="i => i"
|
||||||
>
|
>
|
||||||
<template #header="{selected}">
|
<template v-slot:header="{selected}">
|
||||||
<div class="bulk-actions">
|
<div class="bulk-actions">
|
||||||
<ProgressButton
|
<ProgressButton
|
||||||
v-if="selected.length > 0"
|
v-if="selected.length > 0"
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
:click="() => blockUsers(selected)"
|
:click="() => blockUsers(selected)"
|
||||||
>
|
>
|
||||||
{{ $t('user_card.block') }}
|
{{ $t('user_card.block') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('user_card.block_progress') }}
|
{{ $t('user_card.block_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
|
@ -39,16 +39,16 @@
|
||||||
:click="() => unblockUsers(selected)"
|
:click="() => unblockUsers(selected)"
|
||||||
>
|
>
|
||||||
{{ $t('user_card.unblock') }}
|
{{ $t('user_card.unblock') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('user_card.unblock_progress') }}
|
{{ $t('user_card.unblock_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #item="{item}">
|
<template v-slot:item="{item}">
|
||||||
<BlockCard :user-id="item" />
|
<BlockCard :user-id="item" />
|
||||||
</template>
|
</template>
|
||||||
<template #empty>
|
<template v-slot:empty>
|
||||||
{{ $t('settings.no_blocks') }}
|
{{ $t('settings.no_blocks') }}
|
||||||
</template>
|
</template>
|
||||||
</BlockList>
|
</BlockList>
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
:query="queryUserIds"
|
:query="queryUserIds"
|
||||||
:placeholder="$t('settings.search_user_to_mute')"
|
:placeholder="$t('settings.search_user_to_mute')"
|
||||||
>
|
>
|
||||||
<template #default="row">
|
<template v-slot="row">
|
||||||
<MuteCard
|
<MuteCard
|
||||||
:user-id="row.item"
|
:user-id="row.item"
|
||||||
/>
|
/>
|
||||||
|
@ -74,7 +74,7 @@
|
||||||
:refresh="true"
|
:refresh="true"
|
||||||
:get-key="i => i"
|
:get-key="i => i"
|
||||||
>
|
>
|
||||||
<template #header="{selected}">
|
<template v-slot:header="{selected}">
|
||||||
<div class="bulk-actions">
|
<div class="bulk-actions">
|
||||||
<ProgressButton
|
<ProgressButton
|
||||||
v-if="selected.length > 0"
|
v-if="selected.length > 0"
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
:click="() => muteUsers(selected)"
|
:click="() => muteUsers(selected)"
|
||||||
>
|
>
|
||||||
{{ $t('user_card.mute') }}
|
{{ $t('user_card.mute') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('user_card.mute_progress') }}
|
{{ $t('user_card.mute_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
|
@ -92,16 +92,16 @@
|
||||||
:click="() => unmuteUsers(selected)"
|
:click="() => unmuteUsers(selected)"
|
||||||
>
|
>
|
||||||
{{ $t('user_card.unmute') }}
|
{{ $t('user_card.unmute') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('user_card.unmute_progress') }}
|
{{ $t('user_card.unmute_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #item="{item}">
|
<template v-slot:item="{item}">
|
||||||
<MuteCard :user-id="item" />
|
<MuteCard :user-id="item" />
|
||||||
</template>
|
</template>
|
||||||
<template #empty>
|
<template v-slot:empty>
|
||||||
{{ $t('settings.no_mutes') }}
|
{{ $t('settings.no_mutes') }}
|
||||||
</template>
|
</template>
|
||||||
</MuteList>
|
</MuteList>
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
:query="queryKnownDomains"
|
:query="queryKnownDomains"
|
||||||
:placeholder="$t('settings.type_domains_to_mute')"
|
:placeholder="$t('settings.type_domains_to_mute')"
|
||||||
>
|
>
|
||||||
<template #default="row">
|
<template v-slot="row">
|
||||||
<DomainMuteCard
|
<DomainMuteCard
|
||||||
:domain="row.item"
|
:domain="row.item"
|
||||||
/>
|
/>
|
||||||
|
@ -125,7 +125,7 @@
|
||||||
:refresh="true"
|
:refresh="true"
|
||||||
:get-key="i => i"
|
:get-key="i => i"
|
||||||
>
|
>
|
||||||
<template #header="{selected}">
|
<template v-slot:header="{selected}">
|
||||||
<div class="bulk-actions">
|
<div class="bulk-actions">
|
||||||
<ProgressButton
|
<ProgressButton
|
||||||
v-if="selected.length > 0"
|
v-if="selected.length > 0"
|
||||||
|
@ -133,16 +133,16 @@
|
||||||
:click="() => unmuteDomains(selected)"
|
:click="() => unmuteDomains(selected)"
|
||||||
>
|
>
|
||||||
{{ $t('domain_mute_card.unmute') }}
|
{{ $t('domain_mute_card.unmute') }}
|
||||||
<template #progress>
|
<template v-slot:progress>
|
||||||
{{ $t('domain_mute_card.unmute_progress') }}
|
{{ $t('domain_mute_card.unmute_progress') }}
|
||||||
</template>
|
</template>
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #item="{item}">
|
<template v-slot:item="{item}">
|
||||||
<DomainMuteCard :domain="item" />
|
<DomainMuteCard :domain="item" />
|
||||||
</template>
|
</template>
|
||||||
<template #empty>
|
<template v-slot:empty>
|
||||||
{{ $t('settings.no_mutes') }}
|
{{ $t('settings.no_mutes') }}
|
||||||
</template>
|
</template>
|
||||||
</DomainMuteList>
|
</DomainMuteList>
|
||||||
|
|
|
@ -130,7 +130,7 @@ const ProfileTab = {
|
||||||
note: this.newBio,
|
note: this.newBio,
|
||||||
locked: this.newLocked,
|
locked: this.newLocked,
|
||||||
// Backend notation.
|
// Backend notation.
|
||||||
|
/* eslint-disable camelcase */
|
||||||
display_name: this.newName,
|
display_name: this.newName,
|
||||||
fields_attributes: this.newFields.filter(el => el != null),
|
fields_attributes: this.newFields.filter(el => el != null),
|
||||||
bot: this.bot,
|
bot: this.bot,
|
||||||
|
@ -138,7 +138,7 @@ const ProfileTab = {
|
||||||
status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
|
status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
|
||||||
permit_followback: this.permit_followback,
|
permit_followback: this.permit_followback,
|
||||||
accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
|
accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
|
||||||
|
/* eslint-enable camelcase */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.emailLanguage) {
|
if (this.emailLanguage) {
|
||||||
|
@ -187,7 +187,7 @@ const ProfileTab = {
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
const reader = new FileReader()
|
const reader = new FileReader()
|
||||||
reader.onload = ({ target }) => {
|
reader.onload = ({ target }) => {
|
||||||
const img = target.result
|
const img = target.result
|
||||||
|
|
|
@ -110,9 +110,11 @@
|
||||||
max="730"
|
max="730"
|
||||||
class="expire-posts-days"
|
class="expire-posts-days"
|
||||||
:placeholder="$t('settings.expire_posts_input_placeholder')"
|
:placeholder="$t('settings.expire_posts_input_placeholder')"
|
||||||
>
|
/>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
<p />
|
|
||||||
<p>
|
<p>
|
||||||
<interface-language-switcher
|
<interface-language-switcher
|
||||||
:prompt-text="$t('settings.email_language')"
|
:prompt-text="$t('settings.email_language')"
|
||||||
|
|
|
@ -1,22 +1,20 @@
|
||||||
import { extractCommit } from 'src/services/version/version.service'
|
const pleromaFeCommitUrl = 'https://akkoma.dev/srxl/akkoma-fe/src/branch/wl-stable'
|
||||||
|
const pleromaBeCommitUrl = 'https://akkoma.dev/srxl/akkoma/src/branch/wl-stable'
|
||||||
const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
|
|
||||||
const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'
|
|
||||||
|
|
||||||
const VersionTab = {
|
const VersionTab = {
|
||||||
data () {
|
data () {
|
||||||
const instance = this.$store.state.instance
|
const instance = this.$store.state.instance
|
||||||
return {
|
return {
|
||||||
backendVersion: instance.backendVersion,
|
backendVersion: `${instance.backendVersion} (with Website League patches)`,
|
||||||
frontendVersion: instance.frontendVersion
|
frontendVersion: `${instance.frontendVersion} (with Website League patches)`
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
frontendVersionLink () {
|
frontendVersionLink () {
|
||||||
return pleromaFeCommitUrl + this.frontendVersion
|
return pleromaFeCommitUrl
|
||||||
},
|
},
|
||||||
backendVersionLink () {
|
backendVersionLink () {
|
||||||
return pleromaBeCommitUrl + extractCommit(this.backendVersion)
|
return pleromaBeCommitUrl
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -215,7 +215,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./shadow_control.js"></script>
|
<script src="./shadow_control.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -218,7 +218,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./side_drawer.js"></script>
|
<script src="./side_drawer.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./staff_panel.js"></script>
|
<script src="./staff_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
||||||
|
|
|
@ -266,16 +266,6 @@
|
||||||
color: $fallback--cGreen;
|
color: $fallback--cGreen;
|
||||||
color: var(--cGreen, $fallback--cGreen);
|
color: var(--cGreen, $fallback--cGreen);
|
||||||
}
|
}
|
||||||
|
|
||||||
.right-side {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.3em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.repeat-tooltip {
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.repeater-avatar {
|
.repeater-avatar {
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
:user="statusoid.user"
|
:user="statusoid.user"
|
||||||
/>
|
/>
|
||||||
<div class="right-side faint">
|
<div class="right-side faint">
|
||||||
<div
|
<span
|
||||||
class="status-username repeater-name"
|
class="status-username repeater-name"
|
||||||
:title="retweeter"
|
:title="retweeter"
|
||||||
>
|
>
|
||||||
|
@ -100,19 +100,14 @@
|
||||||
v-else
|
v-else
|
||||||
:to="retweeterProfileLink"
|
:to="retweeterProfileLink"
|
||||||
>{{ retweeter }}</router-link>
|
>{{ retweeter }}</router-link>
|
||||||
</div>
|
</span>
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
|
<FAIcon
|
||||||
<div
|
icon="retweet"
|
||||||
class="repeat-tooltip"
|
class="repeat-icon"
|
||||||
>
|
:title="$t('tool_tip.repeat')"
|
||||||
<FAIcon
|
/>
|
||||||
icon="retweet"
|
{{ $t('timeline.repeated') }}
|
||||||
class="repeat-icon"
|
|
||||||
:title="$t('tool_tip.repeat')"
|
|
||||||
/>
|
|
||||||
{{ $t('timeline.repeated') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -373,7 +368,7 @@
|
||||||
:controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
|
:controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
|
||||||
@mediaplay="addMediaPlaying($event)"
|
@mediaplay="addMediaPlaying($event)"
|
||||||
@mediapause="removeMediaPlaying($event)"
|
@mediapause="removeMediaPlaying($event)"
|
||||||
@parse-ready="setHeadTailLinks"
|
@parseReady="setHeadTailLinks"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -481,8 +476,8 @@
|
||||||
/>
|
/>
|
||||||
<extra-buttons
|
<extra-buttons
|
||||||
:status="status"
|
:status="status"
|
||||||
@on-error="showError"
|
@onError="showError"
|
||||||
@on-success="clearError"
|
@onSuccess="clearError"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
:mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
|
:mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
|
||||||
:greentext="mergedConfig.greentext"
|
:greentext="mergedConfig.greentext"
|
||||||
:attentions="status.attentions"
|
:attentions="status.attentions"
|
||||||
@parse-ready="onParseReady"
|
@parseReady="onParseReady"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
v-if="status.translation"
|
v-if="status.translation"
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
:mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
|
:mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
|
||||||
:greentext="mergedConfig.greentext"
|
:greentext="mergedConfig.greentext"
|
||||||
:attentions="status.attentions"
|
:attentions="status.attentions"
|
||||||
@parse-ready="onParseReady"
|
@parseReady="onParseReady"
|
||||||
/>
|
/>
|
||||||
<div>
|
<div>
|
||||||
<label class="label">{{ $t('status.override_translation_source_language') }}</label>
|
<label class="label">{{ $t('status.override_translation_source_language') }}</label>
|
||||||
|
@ -89,10 +89,7 @@
|
||||||
</option>
|
</option>
|
||||||
</Select>
|
</Select>
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
<button
|
<button @click="translateStatus" class="btn button-default">
|
||||||
class="btn button-default"
|
|
||||||
@click="translateStatus"
|
|
||||||
>
|
|
||||||
{{ $t('status.translate') }}
|
{{ $t('status.translate') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -141,5 +138,5 @@
|
||||||
<slot v-if="!hideSubjectStatus" />
|
<slot v-if="!hideSubjectStatus" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script src="./status_body.js"></script>
|
<script src="./status_body.js" ></script>
|
||||||
<style lang="scss" src="./status_body.scss" />
|
<style lang="scss" src="./status_body.scss" />
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
:toggle-showing-tall="toggleShowingTall"
|
:toggle-showing-tall="toggleShowingTall"
|
||||||
:toggle-expanding-subject="toggleExpandingSubject"
|
:toggle-expanding-subject="toggleExpandingSubject"
|
||||||
:toggle-showing-long-subject="toggleShowingLongSubject"
|
:toggle-showing-long-subject="toggleShowingLongSubject"
|
||||||
@parse-ready="$emit('parseReady', $event)"
|
@parseReady="$emit('parseReady', $event)"
|
||||||
>
|
>
|
||||||
<div v-if="status.poll && status.poll.options && !compact">
|
<div v-if="status.poll && status.poll.options && !compact">
|
||||||
<Poll
|
<Poll
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./status_content.js"></script>
|
<script src="./status_content.js" ></script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.StatusContent {
|
.StatusContent {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<Modal
|
<Modal
|
||||||
v-if="modalActivated"
|
v-if="modalActivated"
|
||||||
class="status-history-modal-view"
|
class="status-history-modal-view"
|
||||||
@backdrop-clicked="closeModal"
|
@backdropClicked="closeModal"
|
||||||
>
|
>
|
||||||
<div class="status-history-modal-panel panel">
|
<div class="status-history-modal-panel panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
@ -17,9 +17,9 @@
|
||||||
v-for="status in history"
|
v-for="status in history"
|
||||||
:key="status.id"
|
:key="status.id"
|
||||||
:statusoid="status"
|
:statusoid="status"
|
||||||
:is-preview="true"
|
:isPreview="true"
|
||||||
class="conversation-status status-fadein panel-body"
|
class="conversation-status status-fadein panel-body"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
:bound-to="{ x: 'container' }"
|
:bound-to="{ x: 'container' }"
|
||||||
@show="enter"
|
@show="enter"
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<slot />
|
<slot />
|
||||||
</template>
|
</template>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<Status
|
<Status
|
||||||
v-if="status"
|
v-if="status"
|
||||||
:is-preview="true"
|
:is-preview="true"
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
</Popover>
|
</Popover>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./status_popover.js"></script>
|
<script src="./status_popover.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -7,9 +7,8 @@
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
v-if="animated && imageTypeLabel"
|
v-if="animated && imageTypeLabel"
|
||||||
class="image-type-label"
|
class="image-type-label">
|
||||||
>
|
{{ imageTypeLabel }}
|
||||||
{{ imageTypeLabel }}
|
|
||||||
</div>
|
</div>
|
||||||
<canvas
|
<canvas
|
||||||
v-if="animated"
|
v-if="animated"
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./terms_of_service_panel.js"></script>
|
<script src="./terms_of_service_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.tos-content {
|
.tos-content {
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
:dive="dive ? () => dive(status.id) : undefined"
|
:dive="dive ? () => dive(status.id) : undefined"
|
||||||
|
|
||||||
@goto="setHighlight"
|
@goto="setHighlight"
|
||||||
@toggle-expanded="toggleExpanded"
|
@toggleExpanded="toggleExpanded"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
v-if="currentReplies.length && threadShowing"
|
v-if="currentReplies.length && threadShowing"
|
||||||
|
|
|
@ -28,7 +28,4 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.timeline {
|
|
||||||
min-height: 1em;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
class="TimelineQuickSettings"
|
class="TimelineQuickSettings"
|
||||||
:bound-to="{ x: 'container' }"
|
:bound-to="{ x: 'container' }"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<div v-if="loggedIn">
|
<div v-if="loggedIn">
|
||||||
<button
|
<button
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button class="button-unstyled">
|
<button class="button-unstyled">
|
||||||
<FAIcon icon="filter" />
|
<FAIcon icon="filter" />
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -9,12 +9,12 @@
|
||||||
@show="openMenu"
|
@show="openMenu"
|
||||||
@close="() => isOpen = false"
|
@close="() => isOpen = false"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="timeline-menu-popover popover-default">
|
<div class="timeline-menu-popover popover-default">
|
||||||
<TimelineMenuContent />
|
<TimelineMenuContent />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<button class="button-unstyled title timeline-menu-title">
|
<button class="button-unstyled title timeline-menu-title">
|
||||||
<span class="timeline-title">{{ timelineName() }}</span>
|
<span class="timeline-title">{{ timelineName() }}</span>
|
||||||
<span>
|
<span>
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
</Popover>
|
</Popover>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./timeline_menu.js"></script>
|
<script src="./timeline_menu.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
:title="$t('nav.twkn_timeline_description')"
|
:title="$t('nav.twkn_timeline_description')"
|
||||||
:aria-label="$t('nav.twkn_timeline_description')"
|
:aria-label="$t('nav.twkn_timeline_description')"
|
||||||
>{{ $t("nav.twkn") }}</span>
|
>{{ $t("nav.twkn") }}</span>
|
||||||
|
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="currentUser">
|
<li v-if="currentUser">
|
||||||
|
@ -99,7 +100,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./timeline_menu_content.js"></script>
|
<script src="./timeline_menu_content.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "../../_variables.scss";
|
@import "../../_variables.scss";
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./timeline_menu_content.js"></script>
|
<script src="./timeline_menu_content.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "../../_variables.scss";
|
@import "../../_variables.scss";
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="publicTimelineVisible"
|
|
||||||
:to="{ name: 'public-timeline' }"
|
:to="{ name: 'public-timeline' }"
|
||||||
class="nav-icon"
|
class="nav-icon"
|
||||||
|
v-if="publicTimelineVisible"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
fixed-width
|
fixed-width
|
||||||
|
@ -40,9 +40,9 @@
|
||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="federatedTimelineVisible"
|
|
||||||
:to="{ name: 'public-external-timeline' }"
|
:to="{ name: 'public-external-timeline' }"
|
||||||
class="nav-icon"
|
class="nav-icon"
|
||||||
|
v-if="federatedTimelineVisible"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
fixed-width
|
fixed-width
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./timeline_menu_tabs.js"></script>
|
<script src="./timeline_menu_tabs.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -66,7 +66,7 @@ export default {
|
||||||
return this.user.id !== this.$store.state.users.currentUser.id
|
return this.user.id !== this.$store.state.users.currentUser.id
|
||||||
},
|
},
|
||||||
subscribeUrl () {
|
subscribeUrl () {
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
const serverUrl = new URL(this.user.statusnet_profile_url)
|
const serverUrl = new URL(this.user.statusnet_profile_url)
|
||||||
return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
|
return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
|
||||||
},
|
},
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
placement="top"
|
placement="top"
|
||||||
:offset="{ y: 5 }"
|
:offset="{ y: 5 }"
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template v-slot:trigger>
|
||||||
<slot />
|
<slot />
|
||||||
</template>
|
</template>
|
||||||
<template #content>
|
<template v-slot:content>
|
||||||
<div class="user-list-popover">
|
<div class="user-list-popover">
|
||||||
<template v-if="users.length">
|
<template v-if="users.length">
|
||||||
<div
|
<div
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
</Popover>
|
</Popover>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./user_list_popover.js"></script>
|
<script src="./user_list_popover.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
|
@ -121,8 +121,8 @@
|
||||||
</FriendList>
|
</FriendList>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="isUs"
|
|
||||||
key="tags"
|
key="tags"
|
||||||
|
v-if="isUs"
|
||||||
:label="$t('user_card.followed_tags')"
|
:label="$t('user_card.followed_tags')"
|
||||||
>
|
>
|
||||||
<FollowedTagList
|
<FollowedTagList
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
<FollowedTagCard :tag="item" />
|
<FollowedTagCard :tag="item" />
|
||||||
</template>
|
</template>
|
||||||
<template #empty>
|
<template #empty>
|
||||||
{{ $t('user_card.not_following_any_hashtags') }}
|
{{ $t('user_card.not_following_any_hashtags')}}
|
||||||
</template>
|
</template>
|
||||||
</FollowedTagList>
|
</FollowedTagList>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<Modal
|
<Modal
|
||||||
v-if="isOpen"
|
v-if="isOpen"
|
||||||
@backdrop-clicked="closeModal"
|
@backdropClicked="closeModal"
|
||||||
>
|
>
|
||||||
<div class="user-reporting-panel panel">
|
<div class="user-reporting-panel panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="user-reporting-panel-right">
|
<div class="user-reporting-panel-right">
|
||||||
<List :items="statuses">
|
<List :items="statuses">
|
||||||
<template #item="{item}">
|
<template v-slot:item="{item}">
|
||||||
<div class="status-fadein user-reporting-panel-sitem">
|
<div class="status-fadein user-reporting-panel-sitem">
|
||||||
<Status
|
<Status
|
||||||
:in-conversation="false"
|
:in-conversation="false"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./who_to_follow_panel.js"></script>
|
<script src="./who_to_follow_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.who-to-follow * {
|
.who-to-follow * {
|
||||||
|
|
|
@ -84,7 +84,6 @@
|
||||||
"keep_open": "Mantindre el selector obert",
|
"keep_open": "Mantindre el selector obert",
|
||||||
"load_all": "Carregant tots els {emojiAmount} emoji",
|
"load_all": "Carregant tots els {emojiAmount} emoji",
|
||||||
"load_all_hint": "Carregat el primer {saneAmount} emoji, carregar tots els emoji pot causar problemes de rendiment.",
|
"load_all_hint": "Carregat el primer {saneAmount} emoji, carregar tots els emoji pot causar problemes de rendiment.",
|
||||||
"recent": "Recents",
|
|
||||||
"search_emoji": "Buscar un emoji",
|
"search_emoji": "Buscar un emoji",
|
||||||
"stickers": "Adhesius",
|
"stickers": "Adhesius",
|
||||||
"unicode": "Emojis unicode"
|
"unicode": "Emojis unicode"
|
||||||
|
@ -255,10 +254,6 @@
|
||||||
"hint": "Entra per a participar en la conversa",
|
"hint": "Entra per a participar en la conversa",
|
||||||
"login": "Inicia sessió",
|
"login": "Inicia sessió",
|
||||||
"logout": "Tanca la sessió",
|
"logout": "Tanca la sessió",
|
||||||
"logout_confirm": "Segur que vols tancar la sessió?",
|
|
||||||
"logout_confirm_accept_button": "Surt",
|
|
||||||
"logout_confirm_cancel_button": "Canceŀla",
|
|
||||||
"logout_confirm_title": "Tanca la sessió",
|
|
||||||
"password": "Contrasenya",
|
"password": "Contrasenya",
|
||||||
"placeholder": "el meu nom d'usuari",
|
"placeholder": "el meu nom d'usuari",
|
||||||
"recovery_code": "Codi de recuperació",
|
"recovery_code": "Codi de recuperació",
|
||||||
|
@ -271,32 +266,6 @@
|
||||||
"next": "Següent",
|
"next": "Següent",
|
||||||
"previous": "Anterior"
|
"previous": "Anterior"
|
||||||
},
|
},
|
||||||
"moderation": {
|
|
||||||
"moderation": "Moderació",
|
|
||||||
"reports": {
|
|
||||||
"add_note": "Afegeix una nota",
|
|
||||||
"close": "Tanca",
|
|
||||||
"delete_note": "Esborra la nota",
|
|
||||||
"delete_note_accept": "Sí, esborra-la",
|
|
||||||
"delete_note_cancel": "No, conserva-la",
|
|
||||||
"delete_note_confirm": "Segur que vols esborrar aquesta nota?",
|
|
||||||
"delete_note_title": "Cal confirmació",
|
|
||||||
"no_content": "Sense descripció",
|
|
||||||
"no_reports": "No hi ha informes per mostrar",
|
|
||||||
"note_placeholder": "Deixa una nota",
|
|
||||||
"notes": "{ count } nota | { count } notes",
|
|
||||||
"reopen": "Reobre",
|
|
||||||
"report": "Denuncia-ho",
|
|
||||||
"reports": "Denúncies",
|
|
||||||
"resolve": "Resol",
|
|
||||||
"show_closed": "Mostra les tancades",
|
|
||||||
"statuses": "{ count } post| { count } posts",
|
|
||||||
"tag_policy_notice": "Activa la restricció de publicacions segons la TagPolicy MRF",
|
|
||||||
"tags": "Estableix restriccions a les publicacions"
|
|
||||||
},
|
|
||||||
"statuses": "Publicacions",
|
|
||||||
"users": "Usuàries"
|
|
||||||
},
|
|
||||||
"nav": {
|
"nav": {
|
||||||
"about": "Quant a",
|
"about": "Quant a",
|
||||||
"administration": "Administració",
|
"administration": "Administració",
|
||||||
|
@ -313,7 +282,6 @@
|
||||||
"interactions": "Interaccions",
|
"interactions": "Interaccions",
|
||||||
"lists": "Llistes",
|
"lists": "Llistes",
|
||||||
"mentions": "Mencions",
|
"mentions": "Mencions",
|
||||||
"moderation": "Moderació",
|
|
||||||
"preferences": "Preferències",
|
"preferences": "Preferències",
|
||||||
"public_timeline_description": "Apunts públics des d'aquesta instància",
|
"public_timeline_description": "Apunts públics des d'aquesta instància",
|
||||||
"public_tl": "Línia de temps Pública",
|
"public_tl": "Línia de temps Pública",
|
||||||
|
@ -407,12 +375,9 @@
|
||||||
"private": "Aquest apunt serà visible només per els teus seguidors",
|
"private": "Aquest apunt serà visible només per els teus seguidors",
|
||||||
"public": "Aquest apunt serà visible per a tothom",
|
"public": "Aquest apunt serà visible per a tothom",
|
||||||
"unlisted": "Aquest apunt no es veurà ni a la Línia de temps Pública ni a Tota la Xarxa Coneguda"
|
"unlisted": "Aquest apunt no es veurà ni a la Línia de temps Pública ni a Tota la Xarxa Coneguda"
|
||||||
},
|
}
|
||||||
"toggle_content_warning": "Des/activa l'avís de contingut"
|
|
||||||
},
|
},
|
||||||
"registration": {
|
"registration": {
|
||||||
"awaiting_email_confirmation": "S'ha registrat el teu compte i s'ha enviat un correu a la teva adreça. Consulta el correu per completar el registre.",
|
|
||||||
"awaiting_email_confirmation_title": "Pendent de confirmar l'adreça de correu",
|
|
||||||
"bio": "Bio",
|
"bio": "Bio",
|
||||||
"bio_placeholder": "p.e.\nHola! Benvingut a la meva bio.\nM'encanta veure anime i jugar a jocs. Espero que podrem ser amics!",
|
"bio_placeholder": "p.e.\nHola! Benvingut a la meva bio.\nM'encanta veure anime i jugar a jocs. Espero que podrem ser amics!",
|
||||||
"captcha": "CAPTCHA",
|
"captcha": "CAPTCHA",
|
||||||
|
@ -426,8 +391,6 @@
|
||||||
"reason_placeholder": "Aquesta instància aprova els registres manualment.\nExplica a l'administració per què vols registrar-te.",
|
"reason_placeholder": "Aquesta instància aprova els registres manualment.\nExplica a l'administració per què vols registrar-te.",
|
||||||
"register": "Registre",
|
"register": "Registre",
|
||||||
"registration": "Registre",
|
"registration": "Registre",
|
||||||
"request_sent": "La teva soŀlicitud de registre s'ha enviat. Rebràs un correu quan sigui aprovada.",
|
|
||||||
"request_sent_title": "Soŀlicitud de registre",
|
|
||||||
"token": "Codi d'invitació",
|
"token": "Codi d'invitació",
|
||||||
"username_placeholder": "p. ex. akko",
|
"username_placeholder": "p. ex. akko",
|
||||||
"validations": {
|
"validations": {
|
||||||
|
@ -537,8 +500,6 @@
|
||||||
"enable_web_push_notifications": "Habilitar notificacions del navegador",
|
"enable_web_push_notifications": "Habilitar notificacions del navegador",
|
||||||
"enter_current_password_to_confirm": "Posa la teva contrasenya actual per a confirmar la teva identitat",
|
"enter_current_password_to_confirm": "Posa la teva contrasenya actual per a confirmar la teva identitat",
|
||||||
"expert_mode": "Mostra avançat",
|
"expert_mode": "Mostra avançat",
|
||||||
"expire_posts_enabled": "Esborra les publicacions després d'un cert nombre de dies",
|
|
||||||
"expire_posts_input_placeholder": "Nombre de dies",
|
|
||||||
"export_theme": "Desa el tema",
|
"export_theme": "Desa el tema",
|
||||||
"file_export_import": {
|
"file_export_import": {
|
||||||
"backup_restore": "Còpia de seguretat de la configuració",
|
"backup_restore": "Còpia de seguretat de la configuració",
|
||||||
|
@ -680,7 +641,6 @@
|
||||||
"pad_emoji": "Acompanya els emojis amb espais al afegir-los des del selector",
|
"pad_emoji": "Acompanya els emojis amb espais al afegir-los des del selector",
|
||||||
"panelRadius": "Panells",
|
"panelRadius": "Panells",
|
||||||
"pause_on_unfocused": "Pausa quan la pestanya perdi el focus",
|
"pause_on_unfocused": "Pausa quan la pestanya perdi el focus",
|
||||||
"permit_followback_description": "Aprova automàticament les soŀlicituds de seguiment que vinguin d'usuàries que ja segueixes",
|
|
||||||
"play_videos_in_modal": "Reproduir vídeos en un marc emergent",
|
"play_videos_in_modal": "Reproduir vídeos en un marc emergent",
|
||||||
"post_look_feel": "Aspecte i Sensació dels apunts",
|
"post_look_feel": "Aspecte i Sensació dels apunts",
|
||||||
"post_status_content_type": "Tipus de contingut d'apunt predeterminat",
|
"post_status_content_type": "Tipus de contingut d'apunt predeterminat",
|
||||||
|
@ -749,7 +709,6 @@
|
||||||
"show_admin_badge": "Mostra l'insígnia \"Administrador\" en el meu perfil",
|
"show_admin_badge": "Mostra l'insígnia \"Administrador\" en el meu perfil",
|
||||||
"show_moderator_badge": "Mostra l'insígnia \"Moderador\" en el meu perfil",
|
"show_moderator_badge": "Mostra l'insígnia \"Moderador\" en el meu perfil",
|
||||||
"show_nav_shortcuts": "Mostra els accessos directes addicionals en el panell superior",
|
"show_nav_shortcuts": "Mostra els accessos directes addicionals en el panell superior",
|
||||||
"show_page_backgrounds": "Mostra fons de pantalla específics de pàgines, com en les pàgines de perfil d'usuari",
|
|
||||||
"show_panel_nav_shortcuts": "Mostra els accessos directes de navegació de la línia de temps en el panell superior",
|
"show_panel_nav_shortcuts": "Mostra els accessos directes de navegació de la línia de temps en el panell superior",
|
||||||
"show_scrollbars": "Mostra les barres de desplaçament de la columna lateral",
|
"show_scrollbars": "Mostra les barres de desplaçament de la columna lateral",
|
||||||
"show_wider_shortcuts": "Mostra més separats els accessos directes del panell superior",
|
"show_wider_shortcuts": "Mostra més separats els accessos directes del panell superior",
|
||||||
|
@ -925,13 +884,8 @@
|
||||||
"upload_a_photo": "Pujar una foto",
|
"upload_a_photo": "Pujar una foto",
|
||||||
"useStreamingApi": "Rebre apunts i notificacions en temps real",
|
"useStreamingApi": "Rebre apunts i notificacions en temps real",
|
||||||
"useStreamingApiWarning": "És genial emprar-lo. Si es trenca, refresca, suposo?",
|
"useStreamingApiWarning": "És genial emprar-lo. Si es trenca, refresca, suposo?",
|
||||||
"use_blurhash": "Fes borroses les miniatures d'imatges NSFW",
|
|
||||||
"use_contain_fit": "No retallar els adjunts en miniatures",
|
"use_contain_fit": "No retallar els adjunts en miniatures",
|
||||||
"use_one_click_nsfw": "Obre els adjunts NSFW amb només un clic",
|
"use_one_click_nsfw": "Obre els adjunts NSFW amb només un clic",
|
||||||
"user_accepts_direct_messages_from": "Accepta missatges directes de",
|
|
||||||
"user_accepts_direct_messages_from_everybody": "Qualsevol",
|
|
||||||
"user_accepts_direct_messages_from_nobody": "Ningú",
|
|
||||||
"user_accepts_direct_messages_from_people_i_follow": "Comptes que segueixo",
|
|
||||||
"user_mutes": "Usuaris",
|
"user_mutes": "Usuaris",
|
||||||
"user_profile_default_tab": "Pestanya per defecte en el Perfil d'Usuari",
|
"user_profile_default_tab": "Pestanya per defecte en el Perfil d'Usuari",
|
||||||
"user_profiles": "Perfils d'usuari",
|
"user_profiles": "Perfils d'usuari",
|
||||||
|
@ -1054,7 +1008,6 @@
|
||||||
"collapse": "Replega",
|
"collapse": "Replega",
|
||||||
"conversation": "Conversa",
|
"conversation": "Conversa",
|
||||||
"error": "Error carregant la línia de temps: {0}",
|
"error": "Error carregant la línia de temps: {0}",
|
||||||
"follow_tag": "Segueix l'etiqueta",
|
|
||||||
"load_older": "Carrega apunts anteriors",
|
"load_older": "Carrega apunts anteriors",
|
||||||
"no_more_statuses": "No hi ha més apunts",
|
"no_more_statuses": "No hi ha més apunts",
|
||||||
"no_retweet_hint": "L'apunt és només per a seguidors o és \"directe\" i no es pot repetir o citar",
|
"no_retweet_hint": "L'apunt és només per a seguidors o és \"directe\" i no es pot repetir o citar",
|
||||||
|
@ -1064,7 +1017,6 @@
|
||||||
"show_new": "Mostra els nous",
|
"show_new": "Mostra els nous",
|
||||||
"socket_broke": "Connexió a temps real perduda: codi CloseEvent {0}",
|
"socket_broke": "Connexió a temps real perduda: codi CloseEvent {0}",
|
||||||
"socket_reconnected": "Connexió a temps real establerta",
|
"socket_reconnected": "Connexió a temps real establerta",
|
||||||
"unfollow_tag": "Deixa de seguir l'etiqueta",
|
|
||||||
"up_to_date": "Actualitzat"
|
"up_to_date": "Actualitzat"
|
||||||
},
|
},
|
||||||
"toast": {
|
"toast": {
|
||||||
|
@ -1129,7 +1081,6 @@
|
||||||
"block_confirm_title": "Bloqueja l'usuari",
|
"block_confirm_title": "Bloqueja l'usuari",
|
||||||
"block_progress": "Bloquejant…",
|
"block_progress": "Bloquejant…",
|
||||||
"blocked": "Bloquejat!",
|
"blocked": "Bloquejat!",
|
||||||
"blocks_you": "Et té bloquejadi!",
|
|
||||||
"bot": "Bot",
|
"bot": "Bot",
|
||||||
"deactivated": "Desactivat",
|
"deactivated": "Desactivat",
|
||||||
"deny": "Denega",
|
"deny": "Denega",
|
||||||
|
@ -1144,10 +1095,7 @@
|
||||||
"follow_cancel": "Cancel·la la sol·licitud",
|
"follow_cancel": "Cancel·la la sol·licitud",
|
||||||
"follow_progress": "Sol·licitant…",
|
"follow_progress": "Sol·licitant…",
|
||||||
"follow_sent": "Petició enviada!",
|
"follow_sent": "Petició enviada!",
|
||||||
"follow_tag": "Segueix l'etiqueta",
|
|
||||||
"follow_unfollow": "Deixa de seguir",
|
"follow_unfollow": "Deixa de seguir",
|
||||||
"followed_tags": "Etiquetes que segueixes",
|
|
||||||
"followed_users": "Usuaris que segueixes",
|
|
||||||
"followees": "Seguint",
|
"followees": "Seguint",
|
||||||
"followers": "Seguidors",
|
"followers": "Seguidors",
|
||||||
"following": "Seguint!",
|
"following": "Seguint!",
|
||||||
|
@ -1172,14 +1120,12 @@
|
||||||
"mute_domain": "Bloqueja el domini",
|
"mute_domain": "Bloqueja el domini",
|
||||||
"mute_progress": "Silenciant…",
|
"mute_progress": "Silenciant…",
|
||||||
"muted": "Silenciat",
|
"muted": "Silenciat",
|
||||||
"not_following_any_hashtags": "No estàs seguint cap etiqueta",
|
|
||||||
"note": "Nota privada",
|
"note": "Nota privada",
|
||||||
"per_day": "per dia",
|
"per_day": "per dia",
|
||||||
"remote_follow": "Seguiment remot",
|
"remote_follow": "Seguiment remot",
|
||||||
"remove_follower": "Esborra seguidor",
|
"remove_follower": "Esborra seguidor",
|
||||||
"replies": "Amb respostes",
|
"replies": "Amb respostes",
|
||||||
"report": "Informa",
|
"report": "Informa",
|
||||||
"requested_by": "Et vol seguir",
|
|
||||||
"show_repeats": "Mostra les repeticions",
|
"show_repeats": "Mostra les repeticions",
|
||||||
"statuses": "Apunts",
|
"statuses": "Apunts",
|
||||||
"subscribe": "Subscriu-te",
|
"subscribe": "Subscriu-te",
|
||||||
|
@ -1189,13 +1135,11 @@
|
||||||
"unfollow_confirm_accept_button": "Sí, deixa'l de seguir",
|
"unfollow_confirm_accept_button": "Sí, deixa'l de seguir",
|
||||||
"unfollow_confirm_cancel_button": "No, no el deixis de seguir",
|
"unfollow_confirm_cancel_button": "No, no el deixis de seguir",
|
||||||
"unfollow_confirm_title": "Deixa de seguir l'usuari",
|
"unfollow_confirm_title": "Deixa de seguir l'usuari",
|
||||||
"unfollow_tag": "Deixa de seguir l'etiqueta",
|
|
||||||
"unmute": "Deixa de silenciar",
|
"unmute": "Deixa de silenciar",
|
||||||
"unmute_progress": "Deixant de silenciar…",
|
"unmute_progress": "Deixant de silenciar…",
|
||||||
"unsubscribe": "Anul·la la subscripció"
|
"unsubscribe": "Anul·la la subscripció"
|
||||||
},
|
},
|
||||||
"user_profile": {
|
"user_profile": {
|
||||||
"field_validated": "Enllaç verificat",
|
|
||||||
"profile_does_not_exist": "Disculpes, aquest perfil no existeix.",
|
"profile_does_not_exist": "Disculpes, aquest perfil no existeix.",
|
||||||
"profile_loading_error": "Disculpes, hi ha hagut un error carregant aquest perfil.",
|
"profile_loading_error": "Disculpes, hi ha hagut un error carregant aquest perfil.",
|
||||||
"timeline_title": "Línia de temps del usuari"
|
"timeline_title": "Línia de temps del usuari"
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue