adjust readme

.do/deploy.template.yaml

@@ -1,18 +0,0 @@
-spec:
-  name: docuseal
-  services:
-  - name: docuseal
-    dockerfile_path: Dockerfile
-    git:
-      repo_clone_url: https://github.com/docusealco/docuseal.git
-      branch: master
-    envs:
-    - key: SECRET_KEY_BASE
-      value: "- 64 characters string 64 characters string 64 characters string -"
-      type: SECRET
-      scope: RUN_TIME
-    - key: DATABASE_URL
-      scope: RUN_TIME
-      value: ${docuseal-db.DATABASE_URL}
-  databases:
-  - name: docuseal-db

.erb-lint.yml

@@ -30,3 +30,5 @@ linters:
         Enabled: false
       Style/ZeroLengthPredicate:
         Enabled: false
+      Style/RedundantConstantBase:
+        Enabled: false

README.md

@@ -14,7 +14,7 @@
   <a href="https://hub.docker.com/r/docuseal/docuseal">
     <img alt="Docker releases" src="https://img.shields.io/docker/v/docuseal/docuseal">
   </a>
-  <a href="https://discord.com/invite/B5wg5wKk">
+  <a href="https://discord.gg/qygYCDGck9">
     <img src="https://img.shields.io/discord/1125112641170448454?logo=discord"/>
   </a>
   <a href="https://twitter.com/intent/follow?screen_name=docusealco">
@@ -46,7 +46,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 
 | Heroku                                                                       | Railway                                                                      | DigitalOcean                                                                 |
 | ---------------------------------------------------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
-| [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku)   | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.app/template/IGoDnc?referralCode=ruU7JR)             | [<img alt="Deploy on DigitalOcean" src="https://www.deploytodo.com/do-btn-blue.svg" height="40">](https://cloud.digitalocean.com/apps/new?repo=https://github.com/docusealco/docuseal/tree/master&refcode=421d50f53990) |
+| [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku)   | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.app/template/IGoDnc?referralCode=ruU7JR)             | [<img alt="Deploy on DigitalOcean" src="https://www.deploytodo.com/do-btn-blue.svg" height="40">](https://cloud.digitalocean.com/apps/new?repo=https://github.com/docusealco/docuseal-digitalocean/tree/master&refcode=421d50f53990) |
 
 
 #### Docker
@@ -64,7 +64,7 @@ Download docker-compose.yml into your private server:
 curl https://raw.githubusercontent.com/docusealco/docuseal/master/docker-compose.yml > docker-compose.yml
 ```
 
-Run docker compose under a custom domain over https (make sure your DNS points to the server to automatically issue ssl certs with Caddy):
+Run the app under a custom domain over https using docker compose (make sure your DNS points to the server to automatically issue ssl certs with Caddy):
 ```sh
 HOST=your-domain-name.com docker-compose up
 ```

app/controllers/users_controller.rb

@@ -24,24 +24,30 @@ class UsersController < ApplicationController
     if @user.save
       UserMailer.invitation_email(@user).deliver_later!
 
-      redirect_to settings_users_path, notice: 'User has been invited.'
+      redirect_to settings_users_path, notice: 'User has been invited'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
     end
   end
 
   def update
+    return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
+
     if @user.update(user_params.compact_blank)
-      redirect_to settings_users_path, notice: 'User has been updated.'
+      redirect_to settings_users_path, notice: 'User has been updated'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity
     end
   end
 
   def destroy
+    if Docuseal.demo? || @user.id == current_user.id
+      return redirect_to settings_users_path, notice: 'Unable to remove user'
+    end
+
     @user.update!(deleted_at: Time.current)
 
-    redirect_to settings_users_path, notice: 'User has been removed.'
+    redirect_to settings_users_path, notice: 'User has been removed'
   end
 
   private

app/models/submitter.rb

@@ -13,7 +13,7 @@
 #  slug          :string           not null
 #  ua            :string
 #  uuid          :string           not null
-#  values        :string           not null
+#  values        :text             not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  submission_id :bigint           not null
@@ -32,7 +32,7 @@ class Submitter < ApplicationRecord
   belongs_to :submission
 
   attribute :values, :string, default: -> { {} }
-  attribute :slug, :string, default: -> { SecureRandom.base58(8) }
+  attribute :slug, :string, default: -> { SecureRandom.base58(10) }
 
   serialize :values, JSON
 

app/models/template.rb

@@ -6,11 +6,11 @@
 #
 #  id         :bigint           not null, primary key
 #  deleted_at :datetime
-#  fields     :string           not null
+#  fields     :text             not null
 #  name       :string           not null
-#  schema     :string           not null
+#  schema     :text             not null
 #  slug       :string           not null
-#  submitters :string           not null
+#  submitters :text             not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  account_id :bigint           not null
@@ -36,7 +36,7 @@ class Template < ApplicationRecord
   attribute :fields, :string, default: -> { [] }
   attribute :schema, :string, default: -> { [] }
   attribute :submitters, :string, default: -> { [{ name: DEFAULT_SUBMITTER_NAME, uuid: SecureRandom.uuid }] }
-  attribute :slug, :string, default: -> { SecureRandom.base58(8) }
+  attribute :slug, :string, default: -> { SecureRandom.base58(10) }
 
   serialize :fields, JSON
   serialize :schema, JSON

app/views/layouts/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal">
+<html data-theme="docuseal" lang="en">
   <head>
     <title>
       DocuSeal | Open Source Document Filling and Signing

app/views/layouts/form.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal">
+<html data-theme="docuseal" lang="en">
   <head>
     <title>
       DocuSeal | Open Source Document Filling and Signing

app/views/layouts/plain.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal">
+<html data-theme="docuseal" lang="en">
   <head>
     <title>
       DocuSeal | Open Source Document Filling and Signing

config/environments/production.rb

@@ -110,7 +110,7 @@ Rails.application.configure do
   config.active_record.encryption = {
     primary_key: encryption_secret.first(32),
     deterministic_key: encryption_secret.last(32),
-    key_derivation_salt: encryption_secret
+    key_derivation_salt: Digest::SHA256.hexdigest(encryption_secret)
   }
 
   # Do not dump schema after migrations.

db/schema.rb

@@ -86,7 +86,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_01_075115) do
     t.string "uuid", null: false
     t.string "email", null: false
     t.string "slug", null: false
-    t.string "values", null: false
+    t.text "values", null: false
     t.string "ua"
     t.string "ip"
     t.datetime "sent_at"
@@ -102,9 +102,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_01_075115) do
   create_table "templates", force: :cascade do |t|
     t.string "slug", null: false
     t.string "name", null: false
-    t.string "schema", null: false
+    t.text "schema", null: false
-    t.string "fields", null: false
+    t.text "fields", null: false
-    t.string "submitters", null: false
+    t.text "submitters", null: false
     t.bigint "author_id", null: false
     t.bigint "account_id", null: false
     t.datetime "deleted_at"

lib/docuseal.rb

@@ -6,7 +6,7 @@ module Docuseal
   PRODUCT_NAME = 'DocuSeal'
   DEFAULT_APP_URL = 'http://localhost:3000'
   GITHUB_URL = 'https://github.com/docusealco/docuseal'
-  DISCORD_URL = 'https://discord.com/invite/B5wg5wKk'
+  DISCORD_URL = 'https://discord.gg/qygYCDGck9'
   TWITTER_URL = 'https://twitter.com/docusealco'
   TWITTER_HANDLE = '@docusealco'
   SUPPORT_EMAIL = 'support@docuseal.co'