bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'reactions-page'

Browse source 
# Conflicts:
#   app/soapbox/utils/features.js
This commit is contained in:
marcin mikołajczak 2021-09-09 20:48:30 +00:00
commit c2fc7a0331
71 changed files with 2109 additions and 2790 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore
View file

@ -1,6 +1,7 @@
/node_modules/** /node_modules/**
/static/** /static/**
/static-test/** /static-test/**
/public/**
/tmp/** /tmp/**
/coverage/** /coverage/**
!.eslintrc.js !.eslintrc.js

20
.gitignore vendored
View file

@ -8,20 +8,6 @@
/.vs/ /.vs/
yarn-error.log* yarn-error.log*
/static/packs /static/
/static/packs-test /static-test/
/static/emoji /public/
/static/index.html
/static/index.html.gz
/static/404.html
/static/404.html.gz
/static/manifest.json
/static/manifest.json.gz
/static/report.html
/static/sw.js
/static/instance/**
!/static/instance/**.example
!/static/instance/**.example.*
!/static/instance/**.example/**
/static-test
/public

7
.gitlab-ci.yml
View file

@ -1,4 +1,4 @@
image: node:12 image: node:14
variables: variables:
NODE_ENV: test NODE_ENV: test
@ -17,6 +17,7 @@ stages:
- deploy - deploy
before_script: before_script:
- env
- yarn - yarn
lint-js: lint-js:
@ -85,10 +86,10 @@ docs-deploy:
pages: pages:
stage: deploy stage: deploy
before_script: []
script: script:
- yarn build # artifacts are kept between jobs
- mv static public - mv static public
- cp public/{index.html,404.html}
variables: variables:
NODE_ENV: production NODE_ENV: production
artifacts: artifacts:

1
.tool-versions Normal file
View file

@ -0,0 +1 @@
nodejs 14.17.6

2
app/index.ejs
View file

@ -3,6 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<!--server-generated-meta--> <!--server-generated-meta-->
<link rel="icon" type="image/png" href="/favicon.png"> <link rel="icon" type="image/png" href="/favicon.png">
</head> </head>

0
static/instance/about.example/dmca.html → app/instance/about.example/dmca.html
View file

0
static/instance/about.example/index.html → app/instance/about.example/index.html
View file

0
static/instance/about.example/privacy.html → app/instance/about.example/privacy.html
View file

0
static/instance/about.example/tos.html → app/instance/about.example/tos.html
View file

0
static/instance/soapbox.example.json → app/instance/soapbox.example.json
View file

BIN
app/soapbox/__mocks__/api.js
View file

Binary file not shown.

BIN
app/soapbox/actions/__tests__/about-test.js
View file

Binary file not shown.

BIN
app/soapbox/actions/about.js
View file

Binary file not shown.

BIN
app/soapbox/actions/auth.js
View file

Binary file not shown.

BIN
app/soapbox/actions/export_data.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/actions/external_auth.js
View file

Binary file not shown.

BIN
app/soapbox/actions/oauth.js
View file

Binary file not shown.

BIN
app/soapbox/actions/soapbox.js
View file

Binary file not shown.

BIN
app/soapbox/api.js
View file

Binary file not shown.

BIN
app/soapbox/build_config.js
View file

Binary file not shown.

12
app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
View file

@ -19,7 +19,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
<button <button
@ -30,7 +30,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
<button <button
@ -41,7 +41,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
<button <button
@ -52,7 +52,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
<button <button
@ -63,7 +63,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
<button <button
@ -74,7 +74,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
} }
} }
onClick={[Function]} onClick={[Function]}
onKeyUp={[Function]} onKeyDown={[Function]}
tabIndex={-1} tabIndex={-1}
/> />
</div> </div>

BIN
app/soapbox/components/autosuggest_emoji.js
View file

Binary file not shown.

BIN
app/soapbox/components/emoji_selector.js
View file

Binary file not shown.

BIN
app/soapbox/components/sidebar_menu.js
View file

Binary file not shown.

BIN
app/soapbox/containers/soapbox.js
View file

Binary file not shown.

BIN
app/soapbox/features/account_timeline/index.js
View file

Binary file not shown.

62
app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
View file

@ -1,6 +1,66 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<LoginForm /> renders correctly 1`] = ` exports[`<LoginForm /> renders for Mastodon 1`] = `
<form
className="simple_form new_user"
method="post"
>
<fieldset>
<div
className="fields-group"
>
<div
className="input email user_email"
>
<input
aria-label="Username"
autoComplete="off"
className="string email"
name="username"
placeholder="Username"
required={true}
type="text"
/>
</div>
<div
className="input password user_password"
>
<input
aria-label="Password"
autoComplete="off"
className="password"
name="password"
placeholder="Password"
required={true}
type="password"
/>
</div>
<p
className="hint subtle-hint"
>
<a
href="/auth/password/new"
>
Trouble logging in?
</a>
</p>
</div>
</fieldset>
<div
className="actions"
>
<button
className="btn button button-primary"
name="button"
type="submit"
>
Log in
</button>
</div>
</form>
`;
exports[`<LoginForm /> renders for Pleroma 1`] = `
<form <form
className="simple_form new_user" className="simple_form new_user"
method="post" method="post"

64
app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
View file

@ -63,67 +63,3 @@ exports[`<LoginPage /> renders correctly on load 1`] = `
</div> </div>
</form> </form>
`; `;
exports[`<LoginPage /> renders correctly on load 2`] = `
<form
className="simple_form new_user"
method="post"
onSubmit={[Function]}
>
<fieldset
disabled={false}
>
<div
className="fields-group"
>
<div
className="input email user_email"
>
<input
aria-label="Username"
autoComplete="off"
className="string email"
name="username"
placeholder="Username"
required={true}
type="text"
/>
</div>
<div
className="input password user_password"
>
<input
aria-label="Password"
autoComplete="off"
className="password"
name="password"
placeholder="Password"
required={true}
type="password"
/>
</div>
<p
className="hint subtle-hint"
>
<a
href="/auth/reset_password"
onClick={[Function]}
>
Trouble logging in?
</a>
</p>
</div>
</fieldset>
<div
className="actions"
>
<button
className="btn button button-primary"
name="button"
type="submit"
>
Log in
</button>
</div>
</form>
`;

BIN
app/soapbox/features/auth_login/components/__tests__/login_form-test.js
View file

Binary file not shown.

BIN
app/soapbox/features/auth_login/components/__tests__/login_page-test.js
View file

Binary file not shown.

BIN
app/soapbox/features/auth_login/components/login_form.js
View file

Binary file not shown.

BIN
app/soapbox/features/auth_login/components/login_page.js
View file

Binary file not shown.

BIN
app/soapbox/features/compose/components/emoji_picker_dropdown.js
View file

Binary file not shown.

BIN
app/soapbox/features/emoji/emoji.js
View file

Binary file not shown.

BIN
app/soapbox/features/export_data/components/csv_exporter.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/features/export_data/index.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/features/groups/timeline/index.js
View file

Binary file not shown.

BIN
app/soapbox/features/public_layout/components/header.js
View file

Binary file not shown.

BIN
app/soapbox/features/public_layout/index.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/components/link_footer.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/index.js
View file

Binary file not shown.

BIN
app/soapbox/features/ui/util/async-components.js
View file

Binary file not shown.

BIN
app/soapbox/features/video/index.js
View file

Binary file not shown.

BIN
app/soapbox/main.js
View file

Binary file not shown.

BIN
app/soapbox/middleware/sounds.js
View file

Binary file not shown.

BIN
app/soapbox/pages/home_page.js
View file

Binary file not shown.

BIN
app/soapbox/performance.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/auth.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/instance.js
View file

Binary file not shown.

BIN
app/soapbox/utils/features.js
View file

Binary file not shown.

BIN
app/soapbox/utils/state.js
View file

Binary file not shown.

BIN
app/soapbox/wdyr.js
View file

Binary file not shown.

0
static/sounds/boop.mp3 → app/sounds/boop.mp3
View file

0
static/sounds/boop.ogg → app/sounds/boop.ogg
View file

0
static/sounds/chat.mp3 → app/sounds/chat.mp3
View file

0
static/sounds/chat.oga → app/sounds/chat.oga
View file

2
app/styles/ui.scss
View file

@ -179,6 +179,8 @@
} }
&__avatar { &__avatar {
display: block;
border-radius: 50%;
@media (max-width: 405px) { display: none; } @media (max-width: 405px) { display: none; }
} }
} }

BIN
babel.config.js
View file

Binary file not shown.

62
docs/development/build-config.md Normal file
View file

@ -0,0 +1,62 @@
# Build Configuration
When compiling Soapbox FE, environment variables may be passed to change the build itself.
For example:
```sh
NODE_ENV="production" FE_BUILD_DIR="public" FE_SUBDIRECTORY="/soapbox" yarn build
```
### `NODE_ENV`
The environment to build Soapbox FE for.
Options:
- `"production"` - For live sites
- `"development"` - For local development
- `"test"` - Bootstraps test environment
Default: `"development"`
It's recommended to always build in `"production"` mode for live sites.
### `BACKEND_URL`
The base URL for API calls.
You only need to set this if Soapbox FE is hosted in a different place than the backend.
Options:
- An absolute URL, eg `"https://gleasonator.com"`
- Empty string (`""`)`
Default: `""`
### `FE_BUILD_DIR`
The folder to put build files in. This is mostly useful for CI tasks like GitLab Pages.
Options:
- Any directory name, eg `"public"`
Default: `"static"`
### `FE_SUBDIRECTORY`
Subdirectory to host Soapbox FE out of.
When hosting on a subdirectory, you must create a custom build for it.
This option will set the imports in `index.html`, and the basename for routes in React.
Options:
- Any path, eg `"/soapbox"` or `"/fe/soapbox"`
Default: `"/"`
For example, if you want to host the build on `https://gleasonator.com/soapbox`, you can compile it like this:
```sh
NODE_ENV="production" FE_SUBDIRECTORY="/soapbox" yarn build
```

BIN
jsdoc.conf.js Normal file
View file

Binary file not shown.

56
package.json
View file

@ -19,6 +19,7 @@
"start": "npx webpack-dev-server --config webpack", "start": "npx webpack-dev-server --config webpack",
"dev": "${npm_execpath} run start", "dev": "${npm_execpath} run start",
"build": "npx webpack --config webpack", "build": "npx webpack --config webpack",
"jsdoc": "npx jsdoc -c jsdoc.conf.js",
"manage:translations": "node ./webpack/translationRunner.js", "manage:translations": "node ./webpack/translationRunner.js",
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest", "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
"test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass", "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
@ -48,6 +49,7 @@
"@babel/runtime": "^7.14.6", "@babel/runtime": "^7.14.6",
"@fontsource/montserrat": "^4.5.1", "@fontsource/montserrat": "^4.5.1",
"@fontsource/roboto": "^4.5.0", "@fontsource/roboto": "^4.5.0",
"@lcdp/offline-plugin": "^5.1.0",
"@popperjs/core": "^2.4.4", "@popperjs/core": "^2.4.4",
"@welldone-software/why-did-you-render": "^6.2.0", "@welldone-software/why-did-you-render": "^6.2.0",
"array-includes": "^3.0.3", "array-includes": "^3.0.3",
@ -62,9 +64,9 @@
"blurhash": "^1.0.0", "blurhash": "^1.0.0",
"bowser": "^2.11.0", "bowser": "^2.11.0",
"browserslist": "^4.16.6", "browserslist": "^4.16.6",
"cheerio": "^1.0.0-rc.10",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"compression-webpack-plugin": "^6.0.2", "copy-webpack-plugin": "^9.0.1",
"copy-webpack-plugin": "6.4.0",
"core-js": "^3.15.2", "core-js": "^3.15.2",
"cryptocurrency-icons": "^0.17.2", "cryptocurrency-icons": "^0.17.2",
"css-loader": "^5.2.6", "css-loader": "^5.2.6",
@ -73,13 +75,14 @@
"dotenv": "^8.0.0", "dotenv": "^8.0.0",
"emoji-datasource": "5.0.0", "emoji-datasource": "5.0.0",
"emoji-mart": "^3.0.1", "emoji-mart": "^3.0.1",
"entities": "^3.0.1",
"es6-symbol": "^3.1.1", "es6-symbol": "^3.1.1",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"exif-js": "^2.3.0", "exif-js": "^2.3.0",
"file-loader": "^6.0.0", "file-loader": "^6.0.0",
"fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265", "fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265",
"html-webpack-harddisk-plugin": "^1.0.1", "html-webpack-harddisk-plugin": "^2.0.0",
"html-webpack-plugin": "^4.3.0", "html-webpack-plugin": "^5.3.2",
"http-link-header": "^1.0.2", "http-link-header": "^1.0.2",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.12",
"imports-loader": "^1.0.0", "imports-loader": "^1.0.0",
@ -87,8 +90,9 @@
"intl": "^1.2.5", "intl": "^1.2.5",
"intl-messageformat": "^9.0.0", "intl-messageformat": "^9.0.0",
"intl-messageformat-parser": "^6.0.0", "intl-messageformat-parser": "^6.0.0",
"intl-pluralrules": "^1.1.1", "intl-pluralrules": "^1.3.0",
"is-nan": "^1.2.1", "is-nan": "^1.2.1",
"jsdoc": "~3.6.7",
"lodash": "^4.7.11", "lodash": "^4.7.11",
"mark-loader": "^0.1.6", "mark-loader": "^0.1.6",
"marky": "^1.2.1", "marky": "^1.2.1",
@ -96,10 +100,11 @@
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"object-fit-images": "^3.2.3", "object-fit-images": "^3.2.3",
"object.values": "^1.1.0", "object.values": "^1.1.0",
"offline-plugin": "^5.0.7", "path-browserify": "^1.0.1",
"postcss": "^8.1.1", "postcss": "^8.1.1",
"postcss-loader": "^4.0.3", "postcss-loader": "^4.0.3",
"postcss-object-fit-images": "^1.1.2", "postcss-object-fit-images": "^1.1.2",
"process": "^0.11.10",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"punycode": "^2.1.0", "punycode": "^2.1.0",
"qrcode.react": "^1.0.0", "qrcode.react": "^1.0.0",
@ -134,34 +139,35 @@
"semver": "^7.3.2", "semver": "^7.3.2",
"stringz": "^2.0.0", "stringz": "^2.0.0",
"substring-trie": "^1.0.2", "substring-trie": "^1.0.2",
"terser-webpack-plugin": "^4.2.3", "terser-webpack-plugin": "^5.2.3",
"tiny-queue": "^0.2.1", "tiny-queue": "^0.2.1",
"ts-jest": "^27.0.3", "ts-jest": "^27.0.5",
"tslib": "^2.3.1",
"twemoji": "https://github.com/twitter/twemoji#v13.0.2", "twemoji": "https://github.com/twitter/twemoji#v13.0.2",
"typescript": "^4.0.3", "typescript": "^4.0.3",
"unused-files-webpack-plugin": "^3.4.0", "util": "^0.12.4",
"uuid": "^8.0.0", "uuid": "^8.3.2",
"webpack": "^4.41.2", "webpack": "^5.52.0",
"webpack-assets-manifest": "^3.1.1", "webpack-assets-manifest": "^5.0.6",
"webpack-bundle-analyzer": "^4.0.0", "webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^3.3.2", "webpack-cli": "^4.8.0",
"webpack-merge": "^5.2.0", "webpack-merge": "^5.8.0",
"websocket.js": "^0.1.12", "websocket.js": "^0.1.12",
"wicg-inert": "^3.1.1" "wicg-inert": "^3.1.1"
}, },
"devDependencies": { "devDependencies": {
"axios-mock-adapter": "^1.18.1", "axios-mock-adapter": "^1.18.1",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-jest": "^27.0.6", "babel-jest": "^27.1.0",
"enzyme": "^3.8.0", "enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.7.1", "enzyme-adapter-react-16": "^1.15.6",
"eslint": "^7.0.0", "eslint": "^7.0.0",
"eslint-plugin-import": "~2.22.0", "eslint-plugin-import": "^2.24.2",
"eslint-plugin-jsx-a11y": "~6.4.0", "eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-promise": "~4.2.0", "eslint-plugin-promise": "^5.1.0",
"eslint-plugin-react": "~7.21.0", "eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.0.4", "eslint-plugin-react-hooks": "^4.2.0",
"jest": "^27.0.6", "jest": "^27.1.0",
"raf": "^3.4.1", "raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3", "react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.13.1", "react-test-renderer": "^16.13.1",
@ -169,7 +175,7 @@
"stylelint": "^13.7.2", "stylelint": "^13.7.2",
"stylelint-config-standard": "^20.0.0", "stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0", "stylelint-scss": "^3.18.0",
"webpack-dev-server": "^3.5.1", "webpack-dev-server": "^4.1.0",
"yargs": "^16.0.3" "yargs": "^16.0.3"
} }
} }

0
static/instance/about.example/.gitkeep
View file

BIN
webpack/configuration.js
View file

Binary file not shown.

BIN
webpack/development.js
View file

Binary file not shown.

BIN
webpack/production.js
View file

Binary file not shown.

BIN
webpack/rules/babel-build-config.js Normal file
View file

Binary file not shown.

BIN
webpack/rules/file.js
View file

Binary file not shown.

BIN
webpack/rules/index.js
View file

Binary file not shown.

BIN
webpack/shared.js
View file

Binary file not shown.

BIN
webpack/test.js
View file

Binary file not shown.

4610
yarn.lock
View file

File diff suppressed because it is too large Load diff