Merge branch 'dev'

CHANGELOG.md

@@ -23,4 +23,11 @@ _Security updates_
 - Added more documentation on deployment in production
 
 ## v1.2.1
-- Fix presenter url (400 error in production)
+
+- Fix presenter url (400 error in production)
+
+## v1.3.0
+
+- Add Form feature to collect data from your public
+- Improve docs for Docker Compose
+- Improve Docker Compose file reference

README.md

@@ -105,18 +105,14 @@ Now you can visit [`localhost:4000`](http://localhost:4000) from your browser.
 If you have configured `MAIL` to `local`, you can access to the mailbox at [`localhost:4000/dev/mailbox`](http://localhost:4000/dev/mailbox).
 
 
-#### Using Docker
+### Using Docker Compose
 
-You can build the app with Docker:
-```sh
-docker build -t claper .
-docker run -p 4000:4000 -d claper
-```
-
-or you can use the official Docker image:
+A Docker Compose [reference file](https://github.com/ClaperCo/Claper/blob/main/docker-compose.yml) is provided in the repository. You can use it to run Claper with Docker Compose.
 
 ```sh
-docker run -p 4000:4000 ghcr.io/claperco/claper:main
+git clone https://github.com/ClaperCo/Claper.git
+cd Claper
+docker-compose up
 ```
 
 <!-- CONTRIBUTING -->
@@ -142,7 +138,7 @@ Distributed under the GPLv3 License. See `LICENSE.txt` for more information.
 <!-- CONTACT -->
 ## Contact
 
-[![](https://img.shields.io/badge/@alexlionco-1DA1F2?style=for-the-badge&logo=twitter&logoColor=white)](https://twitter.com/alexlionco) 
+[![](https://img.shields.io/badge/@alxlion__-1DA1F2?style=for-the-badge&logo=twitter&logoColor=white)](https://twitter.com/alxlion_) 
 
 Project Link: [https://github.com/ClaperCo/Claper](https://github.com/ClaperCo/Claper)
 

assets/tailwind.config.js

@@ -93,7 +93,11 @@ module.exports = {
       'h-5',
       'left-2.5',
       'top-3',
-      'h-7'
+      'h-7',
+      'bg-secondary-600',
+      'text-white',
+      'bg-white',
+      'text-gray-600'
     ]
   },
   darkMode: false, // or 'media' or 'class'

docker-compose.yml

@@ -12,6 +12,8 @@ services:
     image: ghcr.io/claperco/claper:latest
     ports: 
       - 4000:4000
+    volumes:
+      - uploads:/app/priv/static/uploads
     environment:
       DATABASE_URL: postgres://claper:claper@db:5432/claper
       SECRET_KEY_BASE: 0LZiQBLw4WvqPlz4cz8RsHJlxNiSqM9B48y4ChyJ5v1oA0L/TPIqRjQNdPZN3iEG

guides/introduction/installation.md

@@ -46,22 +46,16 @@ Now you can visit [`localhost:4000`](http://localhost:4000) from your browser.
 If you have configured `MAIL` to `local`, you can access to the mailbox at [`localhost:4000/dev/mailbox`](http://localhost:4000/dev/mailbox).
 
 
-## Using Docker
+## Using Docker Compose
 
-You can build the app with Docker:
-```sh
-docker build -t claper .
-docker run -p 4000:4000 claper
-```
-
-or you can use the official Docker image:
+A Docker Compose [reference file](https://github.com/ClaperCo/Claper/blob/main/docker-compose.yml) is provided in the repository. You can use it to run Claper with Docker Compose.
 
 ```sh
-docker run -p 4000:4000 ghcr.io/claperco/claper:main
+git clone https://github.com/ClaperCo/Claper.git
+cd Claper
+docker-compose up
 ```
 
-Do not forget to set the environment variables in the docker run command with `docker run -e DATABASE_URL=claper-db -e MAIL=local ...`.
-
 ### ARM architecture
 
 If you are using an ARM architecture (like Apple M1), the original Docker image won't work. You can build the image yourself by replacing the `BUILDER_IMAGE` argument in the `Dockerfile` with `ARG BUILDER_IMAGE="hexpm/elixir-arm64:1.13.2-erlang-24.2.1-debian-bullseye-20210902-slim"` and then build the image as described above.

guides/usage/features.md

@@ -20,6 +20,14 @@ During your presentation, enable **Active poll results** on the dashboard to see
 
 <img src="assets/feature1.png" width="300"/>
 
+## Forms
+
+You can also add forms during your presentation. Users can fill the form and you can see all submissions in real time.
+
+When you create a new presentation, click on **Present/Customize**, select the slide where you want to add form and click **Add interaction**.
+
+After your presentation, you can export all the submissions in CSV format.
+
 ## Moderation tools
 
 You can moderate the messages during your presentation. You can delete messages or ban users from the dashboard.