Skip to content

Commit

Permalink
Merge branch 'main' into feature/autofire-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiomario committed Jul 3, 2024
2 parents 8cb45f0 + b18942f commit f87f843
Show file tree
Hide file tree
Showing 46 changed files with 35,924 additions and 9,424 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: cd clients && pnpm i

- name: Build components and core-tools to run tests in clients
run: cd clients && pnpm --filter "./libs/**" m run build
run: cd clients && pnpm --filter "./libs/slate-*" --filter "./libs/core-tools" --filter "./libs/ckeditor5-*" m run build

- name: Run tests
run: cd clients && pnpm test
Expand Down
4 changes: 2 additions & 2 deletions clients/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ ENV SKIP_PREFLIGHT_CHECK=true

RUN pnpm i

RUN pnpm --filter "./libs/**" m run build
RUN pnpm --filter "./libs/slate-*" --filter "./libs/core-tools" --filter "./libs/ckeditor5-*" m run build

RUN pnpm --filter "./packages/**" m run build
RUN pnpm --filter "./packages/accounts-client" --filter "./packages/canary-client" --filter "./packages/admin-client" m run build
4 changes: 2 additions & 2 deletions clients/deploy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
traefik.http.routers.admin-canary.tls.certresolver: myresolver

redes:
image: ${DOCKER_IMAGE:-nossas/bonde-clients:v7.7.2}
image: ${DOCKER_REDES_IMAGE:-nossas/bonde-clients:v7.7.2}
command: pnpm --filter redes-client start
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
pull_policy: always
Expand All @@ -69,7 +69,7 @@ services:
traefik.http.routers.redes.tls.certresolver: myresolver

public:
image: ${DOCKER_IMAGE:-nossas/bonde-clients:v7.7.2}
image: ${DOCKER_WEBPAGE_IMAGE:-nossas/bonde-clients:v7.7.2}
command: pnpm --filter webpage-client start
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
pull_policy: always
Expand Down
49 changes: 49 additions & 0 deletions clients/libs/ckeditor5-custom-build/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Software License Agreement
==========================

Copyright (c) 2014-2024, CKSource Holding sp. z o.o. All rights reserved.

Online builder code samples are licensed under the terms of the MIT License (see Appendix A):

http://en.wikipedia.org/wiki/MIT_License

CKEditor 5 collaboration features are only available under a commercial license. [Contact us](https://ckeditor.com/contact/) for more details.

Free 30-days trials of CKEditor 5 collaboration features are available:
* https://ckeditor.com/collaboration/ - Real-time collaboration (with all features).
* https://ckeditor.com/collaboration/comments/ - Inline comments feature (without real-time collaborative editing).
* https://ckeditor.com/collaboration/track-changes/ - Track changes feature (without real-time collaborative editing).

Trademarks
----------

CKEditor is a trademark of CKSource Holding sp. z o.o. All other brand
and product names are trademarks, registered trademarks or service
marks of their respective holders.

---

Appendix A: The MIT License
---------------------------

The MIT License (MIT)

Copyright (c) 2014-2024, CKSource Holding sp. z o.o.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
60 changes: 60 additions & 0 deletions clients/libs/ckeditor5-custom-build/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# CKEditor 5 editor generated with the online builder

This repository presents a CKEditor 5 editor build generated by the [Online builder tool](https://ckeditor.com/ckeditor-5/online-builder)

## Quick start

1. Open the `sample/index.html` page in the browser.

2. Fill the prompt with the license key. If you do not have the license key yet [contact us](https://ckeditor.com/contact/).

## Configuring build

Changes like changing toolbar items, changing order of icons or customizing plugin configurations should be relatively easy to make. Open the `sample/index.html` file and edit the script that initialized the CKEditor 5. Save the file and refresh the browser. That's all.

*Note:* If you have any problems with browser caching use the `Ctrl + R` or `Cmd + R` shortcut depending on your system.

However if you want to remove or add a plugin to the build you need to follow the next step of this guide.

Note that it is also possible to go back to the [Online builder tool](https://ckeditor.com/ckeditor-5/online-builder) and pick other set of plugins. But we encourage you to try the harder way and to learn the principles of Node.js and CKEditor 5 ecosystems that will allow you to do more cool things in the future!

### Installation

In order to rebuild the application you need to install all dependencies first. To do it, open the terminal in the project directory and type:

```
npm install
```

Make sure that you have the `node` and `npm` installed first. If not, then follow the instructions on the [Node.js documentation page](https://nodejs.org/en/).

### Adding or removing plugins

Now you can install additional plugin in the build. Just follow the [Adding a plugin to an editor tutorial](https://ckeditor.com/docs/ckeditor5/latest/installation/plugins/installing-plugins.html#adding-a-plugin-to-an-editor)

### Rebuilding editor

If you have already done the [Installation](#installation) and [Adding or removing plugins](#adding-or-removing-plugins) steps, you're ready to rebuild the editor by running the following command:

```
npm run build
```

This will build the CKEditor 5 to the `build` directory. You can open your browser and you should be able to see the changes you've made in the code. If not, then try to refresh also the browser cache by typing `Ctrl + R` or `Cmd + R` depending on your system.

## What's next?

Follow the guides available on https://ckeditor.com/docs/ckeditor5/latest/framework/index.html and enjoy the document editing.

## FAQ
| Where is the place to report bugs and feature requests?

You can create an issue on https://github.com/ckeditor/ckeditor5/issues including the build id - `93okfd2y7ie6-b0yvsfceumgh`. Make sure that the question / problem is unique, please look for a possibly asked questions in the search box. Duplicates will be closed.

| Where can I learn more about the CKEditor 5 framework?

Here: https://ckeditor.com/docs/ckeditor5/latest/framework/

| Is it possible to use online builder with common frameworks like React, Vue or Angular?

Not yet, but it these integrations will be available at some point in the future.
53 changes: 53 additions & 0 deletions clients/libs/ckeditor5-custom-build/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "ckeditor5-custom-build",
"author": "CKSource",
"description": "A custom CKEditor 5 build made by the CKEditor 5 online builder.",
"version": "0.0.1",
"license": "SEE LICENSE IN LICENSE.md",
"private": true,
"main": "./build/ckeditor.js",
"types": "./build/ckeditor.d.ts",
"dependencies": {
"@ckeditor/ckeditor5-alignment": "41.4.2",
"@ckeditor/ckeditor5-basic-styles": "41.4.2",
"@ckeditor/ckeditor5-block-quote": "41.4.2",
"@ckeditor/ckeditor5-cloud-services": "41.4.2",
"@ckeditor/ckeditor5-editor-classic": "41.4.2",
"@ckeditor/ckeditor5-essentials": "41.4.2",
"@ckeditor/ckeditor5-font": "41.4.2",
"@ckeditor/ckeditor5-heading": "41.4.2",
"@ckeditor/ckeditor5-html-support": "41.4.2",
"@ckeditor/ckeditor5-image": "41.4.2",
"@ckeditor/ckeditor5-indent": "41.4.2",
"@ckeditor/ckeditor5-link": "41.4.2",
"@ckeditor/ckeditor5-list": "41.4.2",
"@ckeditor/ckeditor5-media-embed": "41.4.2",
"@ckeditor/ckeditor5-paragraph": "41.4.2",
"@ckeditor/ckeditor5-special-characters": "41.4.2",
"@ckeditor/ckeditor5-style": "41.4.2",
"@ckeditor/ckeditor5-table": "41.4.2",
"@ckeditor/ckeditor5-undo": "41.4.2",
"@ckeditor/ckeditor5-upload": "41.4.2"
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "41.4.2",
"@ckeditor/ckeditor5-dev-translations": "^32.1.2",
"@ckeditor/ckeditor5-dev-utils": "^32.1.2",
"@ckeditor/ckeditor5-theme-lark": "41.4.2",
"css-loader": "^5.2.7",
"postcss": "^8.4.38",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.2",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^9.5.1",
"typescript": "5.0.4",
"webpack": "^5.91.0",
"webpack-cli": "^4.10.0"
},
"scripts": {
"prepare": "webpack --mode production",
"build": "webpack --mode production",
"postbuild": "tsc --declaration --declarationDir build --stripInternal --emitDeclarationOnly"
}
}
107 changes: 107 additions & 0 deletions clients/libs/ckeditor5-custom-build/sample/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<!DOCTYPE html><!--
Copyright (c) 2014-2024, CKSource Holding sp. z o.o. All rights reserved.
This file is licensed under the terms of the MIT License (see LICENSE.md).
-->

<html lang="en" dir="ltr">
<head>
<title>CKEditor 5 ClassicEditor build</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="https://c.cksource.com/a/1/logos/ckeditor5.png">
<link rel="stylesheet" type="text/css" href="styles.css">
</head>
<body data-editor="ClassicEditor" data-collaboration="false" data-revision-history="false">
<header>
<div class="centered">
<h1><a href="https://ckeditor.com/ckeditor-5/" target="_blank" rel="noopener noreferrer"><img src="https://c.cksource.com/a/1/logos/ckeditor5.svg" alt="CKEditor 5 logo">CKEditor 5</a></h1>
<nav>
<ul>
<li><a href="https://ckeditor.com/docs/ckeditor5/" target="_blank" rel="noopener noreferrer">Documentation</a></li>
<li><a href="https://ckeditor.com/" target="_blank" rel="noopener noreferrer">Website</a></li>
</ul>
</nav>
</div>
</header>
<div class="message">
<div class="centered">
<h2>CKEditor 5 online builder demo - ClassicEditor build</h2>
</div>
</div>
<div class="centered">
<div class="row row-editor">
<div class="editor-container">
<div class="editor">
<h2>Bilingual Personality Disorder</h2>
<figure class="image image-style-side"><img src="https://c.cksource.com/a/1/img/docs/sample-image-bilingual-personality-disorder.jpg">
<figcaption>One language, one person.</figcaption>
</figure>
<p>
This may be the first time you hear about this made-up disorder but
it actually isn’t so far from the truth. Even the studies that were conducted almost half a century show that
<strong>the language you speak has more effects on you than you realize</strong>.
</p>
<p>
One of the very first experiments conducted on this topic dates back to 1964.
<a href="https://www.researchgate.net/publication/9440038_Language_and_TAT_content_in_bilinguals">In the experiment</a>
designed by linguist Ervin-Tripp who is an authority expert in psycholinguistic and sociolinguistic studies,
adults who are bilingual in English in French were showed series of pictures and were asked to create 3-minute stories.
In the end participants emphasized drastically different dynamics for stories in English and French.
</p>
<p>
Another ground-breaking experiment which included bilingual Japanese women married to American men in San Francisco were
asked to complete sentences. The goal of the experiment was to investigate whether or not human feelings and thoughts
are expressed differently in <strong>different language mindsets</strong>.
Here is a sample from the the experiment:
</p>
<table>
<thead>
<tr>
<th></th>
<th>English</th>
<th>Japanese</th>
</tr>
</thead>
<tbody>
<tr>
<td>Real friends should</td>
<td>Be very frank</td>
<td>Help each other</td>
</tr>
<tr>
<td>I will probably become</td>
<td>A teacher</td>
<td>A housewife</td>
</tr>
<tr>
<td>When there is a conflict with family</td>
<td>I do what I want</td>
<td>It's a time of great unhappiness</td>
</tr>
</tbody>
</table>
<p>
More recent <a href="https://books.google.pl/books?id=1LMhWGHGkRUC">studies</a> show, the language a person speaks affects
their cognition, behaviour, emotions and hence <strong>their personality</strong>.
This shouldn’t come as a surprise
<a href="https://en.wikipedia.org/wiki/Lateralization_of_brain_function">since we already know</a> that different regions
of the brain become more active depending on the person’s activity at hand. Since structure, information and especially
<strong>the culture</strong> of languages varies substantially and the language a person speaks is an essential element of daily life.
</p>
</div>
</div>
</div>
</div>
<footer>
<p><a href="https://ckeditor.com/ckeditor-5/" target="_blank" rel="noopener">CKEditor 5</a>
– Rich text editor of tomorrow, available today
</p>
<p>Copyright © 2003-2024,
<a href="https://cksource.com/" target="_blank" rel="noopener">CKSource</a>
Holding sp. z o.o. All rights reserved.
</p>
</footer>
<script src="../build/ckeditor.js"></script>
<script src="script.js"></script>
</body>
</html>
20 changes: 20 additions & 0 deletions clients/libs/ckeditor5-custom-build/sample/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ClassicEditor
.create( document.querySelector( '.editor' ), {
// Editor configuration.
} )
.then( editor => {
window.editor = editor;
} )
.catch( handleSampleError );

function handleSampleError( error ) {
const issueUrl = 'https://github.com/ckeditor/ckeditor5/issues';

const message = [
'Oops, something went wrong!',
`Please, report the following error on ${ issueUrl } with the build id "93okfd2y7ie6-b0yvsfceumgh" and the error stack trace:`
].join( '\n' );

console.error( message );
console.error( error );
}
Loading

0 comments on commit f87f843

Please sign in to comment.