add test comment 😅

.circleci/images/plume-buildenv/Caddyfile

@@ -1,5 +1,5 @@
 localhost:443 {
-  proxy / integration:7878 {
+  proxy / localhost:7878 {
     transparent
   }
   tls self_signed

.drone.jsonnet

@@ -1,233 +0,0 @@
-// This is the CI config for Plume.
-// It uses a Drone CI instance, on https://ci.joinplu.me
-
-// First of all, we define a few useful constants
-
-// This Docker image contains everything we need to build Plume.
-// Its Dockerfile can be found at https://git.joinplu.me/plume/buildenv
-local plumeEnv = "plumeorg/plume-buildenv:v0.2.0";
-
-// Common cache config
-local cacheConfig(name, extra) = {
-    name: name,
-    image: "meltwater/drone-cache:dev",
-    pull: true,
-    environment: {
-      AWS_ACCESS_KEY_ID: { from_secret: 'minio_key' },
-      AWS_SECRET_ACCESS_KEY: { from_secret: 'minio_secret' },
-    },
-    settings: extra + {
-        cache_key: 'v0-{{ checksum "Cargo.lock" }}-{{ .Commit.Branch }}',
-        archive_format: "gzip",
-        mount: [ "~/.cargo/", "./target" ],
-        bucket: 'cache',
-        path_style: true,
-        endpoints: "127.0.0.1:9000",
-        region: 'us-east-1',
-        debug: true,
-    },
-    volumes: [ { name: "cache", path: "/tmp/cache" } ]
-};
-
-
-// A pipeline step that restores the cache.
-// The cache contains all the cargo build files.
-// Thus, we don't have to download and compile all of our dependencies for each
-// commit.
-// This cache is only "deleted" when the contents of Cargo.lock changes.
-//
-// We use this plugin for caching: https://github.com/meltwater/drone-cache/
-//
-// Potential TODO: use one cache per pipeline, as we used to do when we were
-// using CircleCI.
-local restoreCache = cacheConfig("restore-cache", { restore: true });
-// And a step that saves the cache.
-local saveCache = cacheConfig("save-cache", { rebuild: true });
-
-// This step starts a PostgreSQL database if the db parameter is "postgres",
-// otherwise it does nothing.
-local startDb(db) = if db == "postgres" then {
-    name: "start-db",
-    image: "postgres:12.3-alpine",
-    detach: true,
-    environment: {
-        POSTGRES_USER: "plume",
-        POSTGRES_DB: "plume",
-        POSTGRES_PASSWORD: "password",
-    }
-} else {};
-
-// A utility function to generate a new pipeline
-local basePipeline(name, steps) = {
-    kind: "pipeline",
-    name: name,
-    type: "docker",
-    environment: {
-        RUST_TEST_THREADS: '1',
-    },
-    steps: steps
-};
-
-// And this function creates a pipeline with caching
-local cachedPipeline(name, commands) = basePipeline(
-    name,
-    [
-        restoreCache,
-        {
-            name: name,
-            image: plumeEnv,
-            commands: commands,
-        },
-        saveCache
-    ]
-);
-
-// This function creates a step to upload artifacts to Minio
-local upload(name, source) = {
-    name: name,
-    image: 'plugins/s3',
-    settings: {
-        bucket: 'artifacts',
-        source: source,
-        target: '/${DRONE_BUILD_NUMBER}',
-        path_style: true,
-        endpoint: 'http://127.0.0.1:9000',
-        access_key: { from_secret: 'minio_key' },
-        secret_key: { from_secret: 'minio_secret' },
-    },
-};
-
-
-// Here starts the actual list of pipelines!
-
-// PIPELINE 1: a pipeline that runs cargo fmt, and that fails if the style of
-// the code is not standard.
-local CargoFmt() = cachedPipeline(
-    "cargo-fmt",
-    [ "cargo fmt --all -- --check" ]
-);
-
-// PIPELINE 2: runs clippy, a tool that helps
-// you writing idiomatic Rust.
-
-// Helper function:
-local cmd(db, pkg, features=true) = if features then
-    "cargo clippy --no-default-features --features " + db + " --release -p "
-    + pkg + " -- -D warnings"
-else
-    "cargo clippy --no-default-features --release -p "
-    + pkg + " -- -D warnings";
-
-// The actual pipeline:
-local Clippy(db) = cachedPipeline(
-    "clippy-" + db,
-    [
-        cmd(db, "plume"),
-        cmd(db, "plume-cli"),
-        cmd(db, "plume-front", false)
-    ]
-);
-
-// PIPELINE 3: runs unit tests
-local Unit(db) = cachedPipeline(
-    "unit-" + db,
-    [
-        "cargo test --all --exclude plume-front --exclude plume-macro"
-        + " --no-run --no-default-features --features=" + db
-    ]
-);
-
-// PIPELINE 4: runs integration tests
-// It installs a local instance an run integration test with Python scripts
-// that use Selenium (located in scripts/browser_test).
-local Integration(db) = basePipeline(
-    "integration-" + db,
-    [
-        restoreCache,
-        startDb(db),
-        {
-            name: 'selenium',
-            image: 'elgalu/selenium:latest',
-            detach: true,
-        },
-        {
-            name: "integration",
-            image: plumeEnv,
-            environment: {
-                BROWSER: "firefox",
-                DATABASE_URL: if db == "postgres" then "postgres://plume:password@start-db/plume" else "plume.db",
-            },
-            commands: [
-                // Install the front-end
-                "cargo web deploy -p plume-front",
-                // Install the server
-                'cargo install --debug --no-default-features --features="'
-                + db + '",test --force --path .',
-                // Install plm
-                'cargo install --debug --no-default-features --features="'
-                + db + '" --force --path plume-cli',
-                // Run the tests
-                "./script/run_browser_test.sh"
-            ],
-        },
-        saveCache,
-    ]
-);
-
-// PIPELINE 5: make a release build and save artifacts
-//
-// It should also deploy the SQlite build to a test instance
-// located at https://pr-XXX.joinplu.me (but this system is not very
-// stable, and often breaks).
-local Release(db) = basePipeline(
-    "release-" + db,
-    [
-        restoreCache,
-        {
-            name: 'release-' + db,
-            image: plumeEnv,
-            commands: [
-                "cargo web deploy -p plume-front --release",
-                "cargo build --release --no-default-features --features=" + db + " -p plume",
-                "cargo build --release --no-default-features --features=" + db + " -p plume-cli",
-                "./script/generate_artifact.sh",
-            ] + if db == "sqlite" then
-            [ "./script/upload_test_environment.sh" ] else
-            []
-        },
-        upload('artifacts-' + db, '*.tar.gz'),
-        saveCache,
-    ]
-
-);
-
-// PIPELINE 6: upload the new PO templates (.pot) to Crowdin
-//
-// TODO: run only on master
-local PushTranslations() = basePipeline(
-    "push-translations",
-    [
-        {
-            name: "push-translations",
-            image: plumeEnv,
-            commands: [
-                "cargo build",
-                "crowdin upload -b master"
-            ]
-        }
-    ]
-);
-
-// And finally, the list of all our pipelines:
-[
-    CargoFmt(),
-    Clippy("postgres"),
-    Clippy("sqlite"),
-    Unit("postgres"),
-    Unit("sqlite"),
-    Integration("postgres"),
-    Integration("sqlite"),
-    Release("postgres"),
-    Release("sqlite"),
-    PushTranslations()
-]

assets/themes/default/_variables.scss

@@ -1,10 +1,10 @@
 /* Color Scheme */
-$gray: #f3f3f3;
+$gray: #F3F3F3;
 $black: #242424;
-$white: #f8f8f8;
+$white: #F8F8F8;
-$purple: #7765e3;
+$purple: #7765E3;
 $lightpurple: #c2bbee;
-$red: #e92f2f;
+$red: #E92F2F;
 $yellow: #ffe347;
 $green: #23f0c7;
 
@@ -24,14 +24,14 @@ $margin: 0 $horizontal-margin;
 
 /* Fonts */
 
-$route159: "Shabnam", "Route159", serif;
+$route159: "Route159", serif;
-$playfair: "Vazir", "Playfair Display", serif;
+$playfair: "Playfair Display", serif;
-$lora: "Vazir", "Lora", serif;
+$lora: "Lora", serif;
 
 //Code Highlighting
 $code-keyword-color: #45244a;
 $code-source-color: #4c588c;
-$code-constant-color: scale-color(magenta, $lightness: -5%);
+$code-constant-color: scale-color(magenta,$lightness:-5%);
-$code-operator-color: scale-color($code-source-color, $lightness: -5%);
+$code-operator-color: scale-color($code-source-color,$lightness:-5%);
 $code-string-color: #8a571c;
 $code-comment-color: #1c4c8a;

assets/themes/default/dark.scss

@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */
 
-@import url("./feather.css");
+@import url('./feather.css');
-@import url("./fonts/Route159/Route159.css");
+@import url('./fonts/Route159/Route159.css');
-@import url("./fonts/Lora/Lora.css");
+@import url('./fonts/Lora/Lora.css');
-@import url("./fonts/Playfair_Display/PlayfairDisplay.css");
+@import url('./fonts/Playfair_Display/PlayfairDisplay.css');
-@import url("./fonts/Vazir_WOL/Vazir_WOL.css");
-@import url("./fonts/Shabnam_WOL/Shabnam_WOL.css");
 
-@import "dark_variables";
+@import 'dark_variables';
-@import "global";
+@import 'global';
-@import "header";
+@import 'header';
-@import "article";
+@import 'article';
-@import "forms";
+@import 'forms';

assets/themes/default/fonts/Shabnam_WOL/LICENSE

@@ -1,94 +0,0 @@
-Copyright (c) 2015, Saber Rastikerdar (saber.rastikerdar@gmail.com),
-Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

assets/themes/default/fonts/Shabnam_WOL/Shabnam_WOL.css

@@ -1,49 +0,0 @@
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-WOL.eot");
-    src: url("Shabnam-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-WOL.woff2") format("woff2"),
-        url("Shabnam-WOL.woff") format("woff"),
-        url("Shabnam-WOL.ttf") format("truetype");
-    font-weight: normal;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Bold-WOL.eot");
-    src: url("Shabnam-Bold-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Bold-WOL.woff2") format("woff2"),
-        url("Shabnam-Bold-WOL.woff") format("woff"),
-        url("Shabnam-Bold-WOL.ttf") format("truetype");
-    font-weight: bold;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Thin-WOL.eot");
-    src: url("Shabnam-Thin-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Thin-WOL.woff2") format("woff2"),
-        url("Shabnam-Thin-WOL.woff") format("woff"),
-        url("Shabnam-Thin-WOL.ttf") format("truetype");
-    font-weight: 100;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Light-WOL.eot");
-    src: url("Shabnam-Light-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Light-WOL.woff2") format("woff2"),
-        url("Shabnam-Light-WOL.woff") format("woff"),
-        url("Shabnam-Light-WOL.ttf") format("truetype");
-    font-weight: 300;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Medium-WOL.eot");
-    src: url("Shabnam-Medium-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Medium-WOL.woff2") format("woff2"),
-        url("Shabnam-Medium-WOL.woff") format("woff"),
-        url("Shabnam-Medium-WOL.ttf") format("truetype");
-    font-weight: 500;
-}

assets/themes/default/fonts/Vazir_WOL/LICENSE

@@ -1,51 +0,0 @@
-Changes by Saber Rastikerdar (saber.rastikerdar@gmail.com) are in public domain.
-Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
-
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. 
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 

assets/themes/default/fonts/Vazir_WOL/Vazir_WOL.css

@@ -1,65 +0,0 @@
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-WOL.eot');
-    src: url('Vazir-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-WOL.woff2') format('woff2'),
-        url('Vazir-WOL.woff') format('woff'),
-        url('Vazir-WOL.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Bold-WOL.eot');
-    src: url('Vazir-Bold-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Bold-WOL.woff2') format('woff2'),
-        url('Vazir-Bold-WOL.woff') format('woff'),
-        url('Vazir-Bold-WOL.ttf') format('truetype');
-    font-weight: bold;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Black-WOL.eot');
-    src: url('Vazir-Black-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Black-WOL.woff2') format('woff2'),
-        url('Vazir-Black-WOL.woff') format('woff'),
-        url('Vazir-Black-WOL.ttf') format('truetype');
-    font-weight: 900;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Medium-WOL.eot');
-    src: url('Vazir-Medium-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Medium-WOL.woff2') format('woff2'),
-        url('Vazir-Medium-WOL.woff') format('woff'),
-        url('Vazir-Medium-WOL.ttf') format('truetype');
-    font-weight: 500;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Light-WOL.eot');
-    src: url('Vazir-Light-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Light-WOL.woff2') format('woff2'),
-        url('Vazir-Light-WOL.woff') format('woff'),
-        url('Vazir-Light-WOL.ttf') format('truetype');
-    font-weight: 300;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Thin-WOL.eot');
-    src: url('Vazir-Thin-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Thin-WOL.woff2') format('woff2'),
-        url('Vazir-Thin-WOL.woff') format('woff'),
-        url('Vazir-Thin-WOL.ttf') format('truetype');
-    font-weight: 100;
-    font-style: normal;
-}

assets/themes/default/light.scss

@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */
 
-@import url("./feather.css");
+@import url('./feather.css');
-@import url("./fonts/Route159/Route159.css");
+@import url('./fonts/Route159/Route159.css');
-@import url("./fonts/Lora/Lora.css");
+@import url('./fonts/Lora/Lora.css');
-@import url("./fonts/Playfair_Display/PlayfairDisplay.css");
+@import url('./fonts/Playfair_Display/PlayfairDisplay.css');
-@import url("./fonts/Vazir_WOL/Vazir_WOL.css");
-@import url("./fonts/Shabnam_WOL/Shabnam_WOL.css");
 
-@import "variables";
+@import 'variables';
-@import "global";
+@import 'global';
-@import "header";
+@import 'header';
-@import "article";
+@import 'article';
-@import "forms";
+@import 'forms';

plume-front/src/main.rs

@@ -46,6 +46,9 @@ lazy_static! {
         let lang = js! { return navigator.language }.into_string().unwrap();
         let lang = lang.splitn(2, '-').next().unwrap_or("en");
 
+        // Force a language (Add .env setting)
+        //let lang = "fa"; ???
+
         let english_position = catalogs
             .iter()
             .position(|(language_code, _)| *language_code == "en")

script/browser_test/utils.py

@@ -13,12 +13,10 @@ class Browser(unittest.TestCase):
             raise Exception("No browser was requested")
         capabilities['acceptSslCerts'] = True
         self.driver = webdriver.Remote(
-            # The "selenium" address is set up by Drone CI and "points" to the container running selenium
+            command_executor='http://localhost:24444/wd/hub',
-            command_executor='http://selenium:24444/wd/hub',
             desired_capabilities=capabilities)
     def tearDown(self):
         self.driver.close()
 
     def get(self, url):
-        # Like "selenium", integration is mapped to the container that runs the plume instance
         return self.driver.get("https://localhost" + url)

script/run_browser_test.sh

@@ -12,7 +12,7 @@ plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'
 plume &
 caddy -conf /Caddyfile &
 
-until curl http://localhost:7878/test/health -f; do sleep 1; done #2>/dev/null >/dev/null
+until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null
 
 cd $(dirname $0)/browser_test/
 python3 -m unittest *.py