-```dvc
-$ dvc exp run --set-param featurize.max_features=3000
-```
+### ⚙️ Installing the example project
-
-Let's set up experiments with different hyperparameters. We can use the
-`--queue` flag to define all the combinations we want to try without executing
-anything (yet):
+Running the experiment with the default project settings requires only the
+command:
```dvc
-$ dvc exp run --queue -S train.min_split=8
-Queued experiment 'd3f6d1e' for future execution.
-$ dvc exp run --queue -S train.min_split=64
-Queued experiment 'f1810e0' for future execution.
-$ dvc exp run --queue -S train.min_split=2 -S train.n_est=100
-Queued experiment '7323ea2' for future execution.
-$ dvc exp run --queue -S train.min_split=8 -S train.n_est=100
-Queued experiment 'c605382' for future execution.
-$ dvc exp run --queue -S train.min_split=64 -S train.n_est=100
-Queued experiment '0cdee86' for future execution.
+$ dvc exp run
+...
+Reproduced experiment(s): exp-b28f0
+Experiment results have been applied to your workspace.
+...
```
-Next, run all (`--run-all`) queued experiments in parallel (using `--jobs`):
+It runs the specified command (`python train.py`) in `dvc.yaml`. That command
+writes the metrics values to `metrics.json`.
-```dvc
-$ dvc exp run --run-all --jobs 2
-```
+This experiment is then associated with the values found in the parameters file
+(`params.yaml`), and other dependencies (`data/images/`) with these produced
+metrics.
-## Comparing many experiments
+The purpose of the `dvc exp` family of commands is to let you run, capture, and
+compare the machine learning experiments at once as you iterate on your project.
+The artifacts like models and metrics produced by each experiment are tracked by
+DVC, and the associated parameters and metrics can be committed to Git as text
+files.
-To compare all of these experiments, we need more than `diff`. `dvc exp show`
-compares any number of experiments in one table:
+You can review the experiment results with `dvc exp show` and see these metrics
+and results in a nicely formatted table:
```dvc
-$ dvc exp show --no-timestamp \
- --include-params train.n_est,train.min_split
+$ dvc exp show
```
```dvctable
-┏━━━━━━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┓
-┃ neutral:**Experiment** ┃ metric:**avg_prec** ┃ metric:**roc_auc** ┃ param:**train.n_est**┃ param:**train.min_split** ┃
-┡━━━━━━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━┩
-│ **workspace** │ **0.56191** │ **0.93345** │ **50** │ **2** │
-│ **master** │ **0.55259** │ **0.91536** │ **50** │ **2** │
-│ ├── exp-bfe64 │ 0.57833 │ 0.95555 │ 50 │ 8 │
-│ ├── exp-b8082 │ 0.59806 │ 0.95287 │ 50 │ 64 │
-│ ├── exp-c7250 │ 0.58876 │ 0.94524 │ 100 │ 2 │
-│ ├── exp-b9cd4 │ 0.57953 │ 0.95732 │ 100 │ 8 │
-│ ├── exp-98a96 │ 0.60405 │ 0.9608 │ 100 │ 64 │
-│ └── exp-ad5b1 │ 0.56191 │ 0.93345 │ 50 │ 2 │
-└───────────────┴──────────┴─────────┴────────────┴─────────────────┘
+┏━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┓
+┃ white:**Experiment** ┃ white:**Created** ┃ yellow:**loss** ┃ yellow:**acc** ┃ blue:**train.epochs** ┃ blue:**model.conv_units** ┃
+┡━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━┩
+│ workspace │ - │ 0.23282 │ 0.9152 │ 10 │ 16 │
+│ 7317bc6 │ Jul 18, 2021 │ - │ - │ 10 │ 16 │
+│ └── 1a1d858 [exp-6dccf] │ 03:21 PM │ 0.23282 │ 0.9152 │ 10 │ 16 │
+└─────────────────────────┴──────────────┴─────────┴────────┴──────────────┴──────────────────┘
```
-Each experiment is given an arbitrary name by default (although we can specify
-one with `dvc exp run -n`.) We can see that `exp-98a96` performed best among
-both of our metrics, with 100 estimators and a minimum of 64 samples to split a
-node.
-
-> See `dvc exp show --help` for more info on its options.
-
-## Persisting experiments
-
-Now that we know the best parameters, let's keep that experiment and ignore the
-rest.
-
-`dvc exp apply` rolls back the workspace to the specified
-experiment:
-
-```dvc
-$ dvc exp apply exp-98a96
-Changes for experiment 'exp-98a96' have been applied to your workspace.
-```
+The `workspace` row in the table shows the results of the most recent experiment
+that's available in the workspace. The table also shows each
+experiment in a separate row, along with the Git commit IDs they are attached
+to. We can see that the experiment we run has a name `exp-6dccf` and was run
+from the commit ID `7317bc6`.
+These commands are run in the [`example-dvc-experiments`][ede] project. You can
+run the commands in this document after cloning the repository, installing the
+requirements, and pulling the data.
-### 💡 Expand to see what happens under the hood.
+#### Clone the project and create virtual environment
-`dvc exp run` is similar to `dvc repro` but with some added conveniences for
-running experiments. The `--set-param` (or `-S`) flag sets the values for
-parameters as a shortcut for editing `params.yaml`.
+Please clone the project and create a virtual environment.
-Check that the `featurize.max_features` value has been updated in `params.yaml`:
+> We strongly recommend to create a virtual environment to keep the libraries we
+> use isolated from the rest of your system. This prevents version conflicts.
-```git
- featurize:
-- max_features: 1500
-+ max_features: 3000
+```dvc
+$ git clone https://github.com/iterative/example-dvc-experiments -b get-started
+$ cd example-dvc-experiments
+$ virtualenv .venv
+$ . .venv/bin/activate
+$ python -m pip install -r requirements.txt
```
-Any edits to dependencies (parameters or source code) will be
-reflected in the experiment run.
+#### Get the data set
-
-
-`dvc exp diff` compares experiments:
+The repository we cloned doesn't contain the dataset. Instead of storing the
+data in the Git repository, we use DVC to retrieve from a shared data store. In
+this case, we use `dvc pull` to update the missing data files.
```dvc
-$ dvc exp diff
-Path Metric Value Change
-scores.json avg_prec 0.56191 0.009322
-scores.json roc_auc 0.93345 0.018087
-
-Path Param Value Change
-params.yaml featurize.max_features 3000 1500
+$ dvc pull
```
-## Queueing experiments
+The repository already contains the necessary configuration to run the
+experiments.
-So far, we have been tuning the `featurize` stage, but there are also parameters
-for the `train` stage (which trains a
-[random forest classifier](https://scikit-learn.org/stable/modules/generated/sklearn.ensemble.RandomForestClassifier.html)).
-
-These are the `train` parameters from `params.yaml`:
-
-```yaml
-train:
- seed: 20170428
- n_est: 50
- min_split: 2
-```
+
-### 💡 Expand to see what happens under the hood.
+### ℹ️ If you used `dvc repro` before
-`dvc exp apply` is similar to `dvc checkout`, but works with experiments
-instead. DVC tracks everything in the pipeline for each experiment (parameters,
-metrics, dependencies, and outputs), retrieving things later as needed.
+Earlier versions of DVC uses `dvc repro` to run the pipeline. If you already
+have a DVC project, you may already be using `dvc repro`.
-Check that `scores.json` reflects the metrics in the table above:
+We use `dvc repro` to run the pipeline as found in the workspace.
+All the parameters and dependencies are retrieved from the current workspace. It
+doesn't use any specialized mechanism to track experiments.
-```json
-{ "avg_prec": 0.6040544652105823, "roc_auc": 0.9608017142900953 }
-```
+When you have a large number of experiments that you don't want to commit all to
+Git, it's better to use `dvc exp run`. It allows to change the parameters
+quickly, can track the history of artifacts and has facilities to compare these
+experiments easily.
-Once an experiment has been applied to the workspace, it is no different from
-reproducing the result without `dvc exp run`. Let's make it persistent in our
-regular pipeline by committing it in our Git branch:
-
-```dvc
-$ git add dvc.lock params.yaml prc.json roc.json scores.json
-$ git commit -a -m "Preserve best random forest experiment"
-```
-
-## Sharing experiments
+Now let's do some more experimentation.
-After committing the best experiments to our Git branch, we can
-[store and share](/doc/start/data-and-model-versioning#storing-and-sharing) them
-remotely like any other iteration of the pipeline.
+DVC allows to update the parameters defined in the pipeline without modifying
+the files manually. We use this feature to set the convolutional units in
+`train.py`.
```dvc
-dvc push
-git push
+$ dvc exp run --set-param model.conv_units=24
+...
+Reproduced experiment(s): exp-7b56f
+Experiment results have been applied to your workspace.
+...
```
-### 💡 Important information on storing experiments remotely.
-
-The commands in this section require both a `dvc remote default` and a
-[Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes). A
-DVC remote stores the experiment data, and a Git remote stores the code,
-parameters, and other metadata associated with the experiment. DVC supports
-various types of remote storage (local file system, SSH, Amazon S3, Google Cloud
-Storage, HTTP, HDFS, etc.). The Git remote is often a central Git server
-(GitHub, GitLab, BitBucket, etc.).
+### ⚙️ Run multiple experiments in parallel
-
-
-Experiments that have not been made persistent will not be stored or shared
-remotely through `dvc push` or `git push`.
+Instead of running the experiments one-by-one, we can define them to run in a
+batch. This is especially handy when you have long running experiments.
-`dvc exp push` enables storing and sharing any experiment remotely.
+We add experiments to the queue using the `--queue` option of `dvc exp run`. We
+also use `-S` (`--set-param`) to set a value for the parameter.
```dvc
-$ dvc exp push gitremote exp-bfe64
-Pushed experiment 'exp-bfe64' to Git remote 'gitremote'.
+$ dvc exp run --queue -S model.conv_units=32
+Queued experiment '3cac8c6' for future execution.
+$ dvc exp run --queue -S model.conv_units=64
+Queued experiment '23660b6' for future execution.
+$ dvc exp run --queue -S model.conv_units=128
+Queued experiment '6591a57' for future execution.
+$ dvc exp run --queue -S model.conv_units=256
+Queued experiment '9109ea9' for future execution.
```
-`dvc exp list` shows all experiments that have been saved.
+Next, run all (`--run-all`) queued experiments in parallel. You can specify the
+number of parallel processes using `--jobs`:
```dvc
-$ dvc exp list gitremote --all
-72ed9cd:
- exp-bfe64
+$ dvc exp run --run-all --jobs 2
```
-`dvc exp pull` retrieves the experiment from a Git remote.
+
-```dvc
-$ dvc exp pull gitremote exp-bfe64
-Pulled experiment 'exp-bfe64' from Git remote 'gitremote'.
-```
+## Comparing and persisting experiments
-> All these commands take a Git remote as an argument. A `dvc remote default` is
-> also required to share the experiment data.
+The experiments are run several times with different parameters. We use
+`dvc exp show` to compare all of these experiments.
-## Cleaning up
+```dvc
+$ dvc exp show
+```
-Let's take another look at the experiments table:
+```dvctable
+┏━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┓
+┃ white:**Experiment** ┃ white:**Created** ┃ yellow:**loss** ┃ yellow:**acc** ┃ blue:**train.epochs** ┃ blue:**model.conv_units** ┃
+┡━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━┩
+│ workspace │ - │ 0.23508 │ 0.9151 │ 10 │ 24 │
+│ 7317bc6 │ Jul 18, 2021 │ - │ - │ 10 │ 16 │
+│ ├── e2647ef [exp-ee8a4] │ 05:14 PM │ 0.23146 │ 0.9145 │ 10 │ 64 │
+│ ├── 15c9451 [exp-a9be6] │ 05:14 PM │ 0.25231 │ 0.9102 │ 10 │ 32 │
+│ ├── 9c32227 [exp-17dd9] │ 04:46 PM │ 0.23687 │ 0.9167 │ 10 │ 256 │
+│ ├── 8a9cb15 [exp-29d93] │ 04:46 PM │ 0.24459 │ 0.9134 │ 10 │ 128 │
+│ ├── dfc536f [exp-a1bd9] │ 03:35 PM │ 0.23508 │ 0.9151 │ 10 │ 24 │
+│ └── 1a1d858 [exp-6dccf] │ 03:21 PM │ 0.23282 │ 0.9152 │ 10 │ 16 │
+└─────────────────────────┴──────────────┴─────────┴────────┴──────────────┴──────────────────┘
+```
+
+By default, it shows all the parameters and the metrics with the timestamp. If
+you have a large number of parameters, metrics or experiments, this may lead to
+a cluttered view. You can limit the table to specific metrics, or parameters, or
+hide the timestamp column with `--include-metrics`, `--include-params`, or
+`--no-timestamp` options of the command, respectively.
```dvc
$ dvc exp show --no-timestamp \
- --include-params train.n_est,train.min_split
+ --include-params model.conv_units --include-metrics acc
```
```dvctable
-┏━━━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┓
-┃ neutral:**Experiment** ┃ metric:**avg_prec** ┃ metric:**roc_auc** ┃ param:**train.n_est**┃ param:**train.min_split** ┃
-┡━━━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━┩
-│ **workspace** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-│ **master** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-└────────────┴──────────┴─────────┴────────────┴─────────────────┘
-```
-
-Where did all the experiments go? By default, `dvc exp show` only shows
-experiments since the last commit, but don't worry. The experiments remain
-cached and can be shown or applied. For example, use `-n` to show
-experiments from the previous _n_ commits:
+┏━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━━━━━━━━┓
+┃ white:**Experiment** ┃ yellow:**acc** ┃ blue:**model.conv_units** ┃
+┡━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━━━━━━━━┩
+│ workspace │ 0.9151 │ 24 │
+│ 7317bc6 │ - │ 16 │
+│ ├── e2647ef [exp-ee8a4] │ 0.9145 │ 64 │
+│ ├── 15c9451 [exp-a9be6] │ 0.9102 │ 32 │
+│ ├── 9c32227 [exp-17dd9] │ 0.9167 │ 256 │
+│ ├── 8a9cb15 [exp-29d93] │ 0.9134 │ 128 │
+│ ├── dfc536f [exp-a1bd9] │ 0.9151 │ 24 │
+│ └── 1a1d858 [exp-6dccf] │ 0.9152 │ 16 │
+└─────────────────────────┴────────┴──────────────────┘
+```
+
+After selecting an experiment from the table, you can create a Git branch that
+contains the experiment with all its related files.
```dvc
-$ dvc exp show -n 2 --no-timestamp \
- --include-params train.n_est,train.min_split
-```
+$ dvc exp branch exp-05e87 "cnn-256"
+Git branch 'cnn-256' has been created from experiment 'exp-05e87'.
+To switch to the new branch run:
-```dvctable
-┏━━━━━━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┓
-┃ neutral:**Experiment** ┃ metric:**avg_prec** ┃ metric:**roc_auc** ┃ param:**train.n_est**┃ param:**train.min_split** ┃
-┡━━━━━━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━┩
-│ **workspace** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-│ **master** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-│ **64d74b2** │ **0.55259** │ **0.91536** │ **50** │ **2** │
-│ ├── exp-bfe64 │ 0.57833 │ 0.95555 │ 50 │ 8 │
-│ ├── exp-b8082 │ 0.59806 │ 0.95287 │ 50 │ 64 │
-│ ├── exp-c7250 │ 0.58876 │ 0.94524 │ 100 │ 2 │
-│ ├── exp-98a96 │ 0.60405 │ 0.9608 │ 100 │ 64 │
-│ ├── exp-b9cd4 │ 0.57953 │ 0.95732 │ 100 │ 8 │
-│ └── exp-ad5b1 │ 0.56191 │ 0.93345 │ 50 │ 2 │
-└───────────────┴──────────┴─────────┴────────────┴─────────────────┘
+ git checkout cnn-256
```
-Eventually, old experiments may clutter the experiments table.
-
-`dvc exp gc` removes all references to old experiments:
+You can then checkout and continue working from this branch, or merge the branch
+into your `main` branch with the usual Git commands.
-```dvc
-$ dvc exp gc --workspace
-$ dvc exp show -n 2 --no-timestamp \
- --include-params train.n_est,train.min_split
-```
+## Go Further
-```dvctable
-┏━━━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┓
-┃ neutral:**Experiment** ┃ metric:**avg_prec** ┃ metric:**roc_auc** ┃ param:**train.n_est**┃ param:**train.min_split** ┃
-┡━━━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━┩
-│ **workspace** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-│ **master** │ **0.60405** │ **0.9608** │ **100** │ **64** │
-│ **64d74b2** │ **0.55259** │ **0.91536** │ **50** │ **2** │
-└────────────┴──────────┴─────────┴────────────┴─────────────────┘
-```
+There are many other features of `dvc exp`, like cleaning up the unused
+experiments, sharing them without committing into Git or getting differences
+between two experiments.
-> `dvc exp gc` only removes references to the experiments; not the cached
-> objects associated with them. To clean up the cache, use
-> `dvc gc`.
+Please see the section on
+[Experiment Management](/doc/user-guide/experiment-management) in the User's
+Guide or `dvc exp` and subcommands in the Command Reference.
diff --git a/content/docs/studio/troubleshooting.md b/content/docs/studio/troubleshooting.md
index 2ebb3698e5..a79b208c41 100644
--- a/content/docs/studio/troubleshooting.md
+++ b/content/docs/studio/troubleshooting.md
@@ -3,6 +3,17 @@
Here we provide help for some of the problems that you may encounter when using
DVC Studio.
+- [Error: No data found to visualize](#error-no-data-found-to-visualize)
+- [Error: No DVC repo was found at the root](#error-no-dvc-repo-was-found-at-the-root)
+- [Error: Non-DVC sub-directory of a monorepo](#error-non-dvc-sub-directory-of-a-monorepo)
+- [Error: No commits were found for the sub-directory](#error-no-commits-were-found-for-the-sub-directory)
+- [View got created, but does not contain any data](#view-got-created-but-does-not-contain-any-data)
+- [View does not contain the columns that I want](#view-does-not-contain-the-columns-that-i-want)
+- [View contains columns that I did not import](#view-contains-columns-that-i-did-not-import)
+- [Error: Failed to push experiment to repository](#error-failed-to-push-experiment-to-repository)
+
+## Support
+
If you need further help, please send us a message using `Help` on the
[project website](https://studio.iterative.ai). You can also create a support
ticket on [GitHub](https://github.com/iterative/studio-support) or join the
@@ -88,3 +99,71 @@ metrics or hyperparameters that you want to visualize.
Refer to the [DVC documentation](https://dvc.org/doc) for help on making commits
to a DVC repository. Instructions on how to specify custom files can be found
[here](/doc/studio/user-guide/views/view-settings#configuring-view-settings).
+
+## View does not contain the columns that I want
+
+There are two possible reasons for this:
+
+1. **The required columns were not imported:** DVC Studio will import up to 200
+ columns (metrics, hyperparameters and files) from your Git repository. If
+ your repository has more than 200 columns, you should
+ [select the columns that are mandatory to import](/doc/studio/user-guide/views/view-settings#mandatory-columns).
+ DVC Studio will also import the unselected columns, but only up to a maximum
+ of 200 columns.
+
+ **What if there are more than 200 mandatory columns?** Currently DVC Studio
+ cannot import over 200 columns. If you have a large repository (with more
+ than 200 mandatory columns), one solution is to split the
+ metrics/
-## ⚙️ Setting up the project
+### ⚙️ Setting up the project
You can follow along with the steps here or you can clone the repo directly from
GitHub and play with it. To clone the repo, run the following commands.
@@ -153,10 +153,10 @@ tracking the metrics along with each checkpoint, so we'll need to add a few
lines of code.
In the `train.py` file, import the [`dvclive`](/doc/dvclive) package with the
-other imports:
+other imports::
```python
-import dvclive
+from dvclive import Live
```
> It's also possible to use DVC's Python API to register checkpoints, or to use
@@ -166,6 +166,8 @@ Then update the following lines of code in the `main` method inside of the
training epoch loop.
```git
++ dvclive = Live()
+
# Iterate over training epochs.
for i in range(1, EPOCHS+1):
# Train in batches.
@@ -215,19 +217,19 @@ Generating lock file 'dvc.lock'
Updating lock file 'dvc.lock'
Checkpoint experiment iteration 'd99d81c'.
-file:///Users/milecia/Repos/checkpoints-tutorial/dvclive.html
+file:///Users/milecia/Repos/checkpoints-tutorial/dvclive_dvc_plots/index.html
Epoch 2: loss=1.25374174118042
Epoch 2: acc=0.7738
Updating lock file 'dvc.lock'
Checkpoint experiment iteration '963b396'.
-file:///Users/milecia/Repos/checkpoints-tutorial/dvclive.html
+file:///Users/milecia/Repos/checkpoints-tutorial/dvclive_dvc_plots/index.html
Epoch 3: loss=0.7242147922515869
Epoch 3: acc=0.8284
Updating lock file 'dvc.lock'
Checkpoint experiment iteration 'd630b92'.
-file:///Users/milecia/Repos/checkpoints-tutorial/dvclive.html
+file:///Users/milecia/Repos/checkpoints-tutorial/dvclive_dvc_plots/index.html
Epoch 4: loss=0.5083536505699158
Epoch 4: acc=0.8538
Updating lock file 'dvc.lock'
diff --git a/content/docs/user-guide/experiment-management/running-experiments.md b/content/docs/user-guide/experiment-management/running-experiments.md
index cb602e44b0..bfa7dff3e8 100644
--- a/content/docs/user-guide/experiment-management/running-experiments.md
+++ b/content/docs/user-guide/experiment-management/running-experiments.md
@@ -146,12 +146,17 @@ $ dvc exp run -S myparams.toml:learning_rate = 0.0001
### Updating experiment parameters on-the-fly
-DVC allows to update the parameters from command line when running
-`dvc experiments`. The `--set-param` (`-S`) option takes a parameter name and
-its value, and updates the params file before the run.
+DVC allows to update parameters from command line when running experiments. The
+`--set-param` (`-S`) option takes an existing parameter name and its value, and
+updates the params file before the run.
```dvc
+$ cat params.yaml
+model:
+ learning_rate: 0.001
+
$ dvc exp run --set-param model.learning_rate=0.0002
+...
```
> Note that parameters are attached to experiments so you can view them together
@@ -164,10 +169,6 @@ times:
$ dvc exp run -S learning_rate=0.001 -S units=128
```
-> ⚠️ Note that DVC doesn't check whether parameters given to `--set-param` are
-> already in the parameters file. If there is a typo, a new or different param
-> will be added/changed.
-
## The experiments queue
The `--queue` option of `dvc exp run` tells DVC to append an experiment for
diff --git a/content/docs/user-guide/how-to/update-tracked-data.md b/content/docs/user-guide/how-to/update-tracked-data.md
index 6bb1708fc7..e5407be74f 100644
--- a/content/docs/user-guide/how-to/update-tracked-data.md
+++ b/content/docs/user-guide/how-to/update-tracked-data.md
@@ -49,6 +49,10 @@ Add the new version of the file back with DVC:
$ dvc add train.tsv
$ git add train.tsv.dvc
$ git commit -m "modify train data"
+
+# If you have remote storage and/or an upstream repo:
+$ dvc push
+$ git push
```
## Replacing files
@@ -75,4 +79,8 @@ And start tracking it again:
$ dvc add train.tsv
$ git add train.tsv.dvc .gitignore
$ git commit -m "new train data"
+
+# If you have remote storage and/or an upstream repo:
+$ dvc push
+$ git push
```
diff --git a/content/docs/user-guide/project-structure/internal-files.md b/content/docs/user-guide/project-structure/internal-files.md
index bf4626c6e2..456df8fd1b 100644
--- a/content/docs/user-guide/project-structure/internal-files.md
+++ b/content/docs/user-guide/project-structure/internal-files.md
@@ -37,16 +37,23 @@ operation.
- `.dvc/tmp`: Directory for miscellaneous temporary files
- `.dvc/tmp/index`: Directory for remote index files that are used for
- optimizing `dvc push`, `dvc pull`, `dvc fetch` and `dvc status -c` operations
+ optimizing `dvc push`, `dvc pull`, `dvc fetch` and `dvc status -c` operations.
+
+ > This location may be overridden with `dvc config index.dir`.
- `.dvc/tmp/md5s`: This directory is used for optimization. It contains a SQLite
- database that stores hash values for files tracked in a DVC project. It also
- saves the corresponding timestamps and inodes, to avoid unnecessary file hash
- computations.
+ state database that stores hash values for files tracked in a DVC project. It
+ also saves the corresponding timestamps and inodes to avoid unnecessary file
+ hash computations. [note 2](#sqlite-default)
+
+ > This parent location may be overridden with `dvc config state.dir`.
+
+- `.dvc/tmp/links`: This directory is used to cleanup your workspace when
+ calling `dvc checkout`. It contains a SQLite state database that stores a list
+ of file links created by DVC (from cache to workspace).
+ [note 2](#sqlite-default)
-- `.dvc/tmp/links`: This directory contains a SQLite database that stores a list
- of file links created by DVC (from cache to workspace). It's used
- to cleanup your workspace when calling `dvc checkout`.
+ > This parent location may be overridden with `dvc config state.dir`.
- `.dvc/tmp/updater`: This file is used store the latest available version of
DVC. It's used to remind the user to upgrade when the installed version is
diff --git a/content/docs/user-guide/project-structure/pipelines-files.md b/content/docs/user-guide/project-structure/pipelines-files.md
index 474b8df552..cef84359c0 100644
--- a/content/docs/user-guide/project-structure/pipelines-files.md
+++ b/content/docs/user-guide/project-structure/pipelines-files.md
@@ -361,7 +361,7 @@ These are the fields that are accepted in each stage:
| `always_changed` | Whether or not this stage is considered as changed by commands such as `dvc status` and `dvc repro`. `false` by default |
| `meta` | (Optional) arbitrary metadata can be added manually with this field. Any YAML content is supported. `meta` contents are ignored by DVC, but they can be meaningful for user processes that read or write `.dvc` files directly. |
| `desc` | (Optional) user description for this stage. This doesn't affect any DVC operations. |
-| `live` | (Optional) [Dvclive](/doc/dvclive/user-guide/dvclive-with-dvc) configuration field |
+| `live` | (Optional) [DVCLive](/doc/dvclive/dvclive-with-dvc) configuration field |
`dvc.yaml` files also support `# comments`.
diff --git a/gatsby-config.js b/gatsby-config.js
index bd876aa906..957289faed 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -57,6 +57,7 @@ const plugins = [
path: path.join(__dirname, 'static')
}
},
+ 'gatsby-plugin-image',
'community-page',
{
resolve: 'gatsby-transformer-remark',
@@ -122,7 +123,14 @@ const plugins = [
}
},
'gatsby-transformer-sharp',
- 'gatsby-plugin-sharp',
+ {
+ resolve: 'gatsby-plugin-sharp',
+ options: {
+ defaults: {
+ placeholder: 'blurred'
+ }
+ }
+ },
{
resolve: 'gatsby-plugin-catch-links',
options: {
@@ -224,28 +232,6 @@ const plugins = [
}
]
-if (process.env.GITHUB_TOKEN) {
- plugins.push({
- resolve: `gatsby-source-github-api`,
- options: {
- // token: required by the GitHub API
- token: process.env.GITHUB_TOKEN,
-
- // GraphQLquery: defaults to a search query
- graphQLQuery: `
- {
- repository(owner: "iterative", name: "dvc") {
- stargazers {
- totalCount
- }
- }
- }
- `,
- variables: {}
- }
- })
-}
-
if (process.env.CONTEXT === 'production') {
plugins.push({
resolve: 'gatsby-plugin-google-analytics',
@@ -258,11 +244,7 @@ if (process.env.CONTEXT === 'production') {
if (process.env.ANALYZE) {
plugins.push({
- resolve: 'gatsby-plugin-webpack-bundle-analyzer',
- options: {
- analyzerPort: 4000,
- production: process.env.NODE_ENV === 'production'
- }
+ resolve: 'gatsby-plugin-webpack-bundle-analyser-v2'
})
}
diff --git a/package.json b/package.json
index 39cb6baa06..0fae34ee0d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"author": "LIMIT_BLOG_PAGES=1 SKIP_DOCS=true gatsby develop",
"build": "gatsby build",
"start": "node ./src/server/index.js",
- "heroku-postbuild": "./scripts/deploy-with-s3.js",
+ "heroku-postbuild": "./scripts/heroku-deploy.sh",
"test": "jest",
"format-staged": "pretty-quick --staged --no-restage --bail",
"format-check": "prettier --check '**/*.{js,jsx,md,tsx,ts,json}'",
@@ -33,50 +33,51 @@
},
"homepage": "https://github.com/iterative/dvc.org#readme",
"engines": {
- "node": "<=15.x"
+ "node": "<=16.x"
},
"dependencies": {
"@hapi/wreck": "^17.0.0",
- "@octokit/graphql": "^4.3.1",
- "@reach/portal": "^0.10.0",
- "@reach/router": "^1.3.3",
- "@reach/tooltip": "^0.10.0",
+ "@octokit/graphql": "^4.8.0",
+ "@reach/portal": "^0.16.2",
+ "@reach/router": "^1.3.4",
+ "@reach/tooltip": "^0.16.2",
"classnames": "^2.2.6",
- "color": "^3.1.2",
+ "color": "^4.0.1",
"compression": "^1.7.4",
- "date-fns": "^2.11.1",
+ "date-fns": "^2.25.0",
"docsearch.js": "^2.6.3",
"ease-component": "^1.0.0",
"express": "^4.17.1",
- "fs-extra": "^9.0.0",
- "gatsby": "^2.20.13",
- "gatsby-image": "^2.3.1",
- "gatsby-link": "^2.3.2",
+ "fs-extra": "^10.0.0",
+ "gatsby": "^3.14.3",
+ "gatsby-link": "^3.14.0",
+ "gatsby-plugin-image": "^1.14.1",
"gatsby-plugin-parent-resolvers": "^1.0.1",
- "gatsby-source-github-api": "^0.2.1",
"github-markdown-css": "^4.0.0",
- "iso-url": "^0.4.7",
- "isomorphic-fetch": "^2.2.1",
+ "graphql": "^15.6.1",
+ "iso-url": "^1.1.5",
+ "isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"moment": "^2.25.3",
- "nanoid": "^3.0.2",
+ "nanoid": "^3.1.30",
"node-cache": "^5.1.0",
"perfect-scrollbar": "^1.5.0",
- "pretty-quick": "^2.0.1",
- "prismjs": "^1.24.0",
+ "postcss": "^8.3.9",
+ "pretty-quick": "^3.1.1",
+ "prismjs": "^1.25.0",
"promise-polyfill": "^8.1.3",
"prop-types": "^15.7.2",
"raf-polyfill": "^1.0.0",
- "react": "^16.13.1",
+ "react": "^17.0.2",
"react-collapse": "^5.0.1",
"react-collapsible": "^2.7.0",
- "react-dom": "^16.13.1",
- "react-ga": "^2.7.0",
- "react-helmet": "^5.2.1",
+ "react-dom": "^17.0.2",
+ "react-ga": "^3.3.0",
+ "react-helmet": "^6.1.0",
"react-popover": "^0.5.10",
- "react-slick": "^0.25.2",
+ "react-slick": "^0.28.1",
"react-use": "^14.0.0",
- "rehype-react": "^5.0.1",
+ "rehype-react": "^6.2.1",
"remark-preset-lint-recommended": "^5.0.0",
"repo-link-check": "^0.7.1",
"reset-css": "^5.0.1",
@@ -86,10 +87,10 @@
"slick-carousel": "^1.8.1",
"title-case": "^3.0.2",
"unist-util-visit": "2.0.2",
- "upath": "^1.2.0"
+ "upath": "^2.0.1"
},
"devDependencies": {
- "@babel/core": "^7.9.0",
+ "@babel/core": "^7.15.8",
"@svgr/webpack": "^5.3.1",
"@types/classnames": "^2.2.10",
"@types/isomorphic-fetch": "^0.0.35",
@@ -99,66 +100,65 @@
"@types/react-dom": "^16.9.6",
"@types/react-helmet": "^5.0.15",
"@types/react-popover": "^0.5.3",
- "@types/react-slick": "^0.23.4",
+ "@types/react-slick": "^0.23.6",
"@types/rehype-react": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
- "autoprefixer": "^9.7.6",
+ "autoprefixer": "^10.3.7",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
- "babel-plugin-transform-define": "^2.0.0",
+ "babel-plugin-transform-define": "^2.0.1",
"babel-plugin-transform-object-assign": "^6.22.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.1",
- "eslint-plugin-json": "^2.1.1",
+ "eslint-plugin-json": "^3.1.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
- "eslint-plugin-react": "^7.19.0",
- "gatsby-plugin-catch-links": "^2.2.1",
- "gatsby-plugin-feed": "^2.4.1",
- "gatsby-plugin-google-analytics": "^2.2.2",
- "gatsby-plugin-manifest": "2.2.23",
- "gatsby-plugin-postcss": "^2.2.1",
- "gatsby-plugin-react-helmet": "^3.2.1",
+ "eslint-plugin-react": "^7.26.1",
+ "gatsby-plugin-catch-links": "^3.14.0",
+ "gatsby-plugin-feed": "^3.14.0",
+ "gatsby-plugin-google-analytics": "^3.14.0",
+ "gatsby-plugin-manifest": "^3.14.0",
+ "gatsby-plugin-postcss": "^4.14.0",
+ "gatsby-plugin-react-helmet": "^4.14.0",
"gatsby-plugin-sentry": "^1.0.1",
- "gatsby-plugin-sharp": "2.2.32",
- "gatsby-plugin-sitemap": "^2.3.1",
- "gatsby-plugin-svgr": "^2.0.2",
- "gatsby-plugin-twitter": "^2.2.2",
- "gatsby-plugin-typescript": "^2.3.1",
- "gatsby-plugin-webpack-bundle-analyzer": "^1.0.5",
- "gatsby-remark-autolink-headers": "^2.2.1",
- "gatsby-remark-copy-linked-files": "^2.2.1",
+ "gatsby-plugin-sharp": "^3.14.1",
+ "gatsby-plugin-sitemap": "^4.10.0",
+ "gatsby-plugin-svgr": "^3.0.0-beta.0",
+ "gatsby-plugin-twitter": "^3.14.0",
+ "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.25",
+ "gatsby-remark-autolink-headers": "^4.11.0",
+ "gatsby-remark-copy-linked-files": "^4.11.0",
"gatsby-remark-embed-gist": "^1.1.9",
- "gatsby-remark-embedder": "^2.0.0",
+ "gatsby-remark-embedder": "^5.0.0",
"gatsby-remark-external-links": "^0.0.4",
- "gatsby-remark-images": "^3.2.2",
- "gatsby-remark-prismjs": "^3.4.1",
+ "gatsby-remark-images": "^5.11.0",
+ "gatsby-remark-prismjs": "^5.11.0",
"gatsby-remark-relative-images": "0.2.3",
- "gatsby-remark-responsive-iframe": "^2.3.1",
- "gatsby-remark-smartypants": "^2.2.1",
- "gatsby-source-filesystem": "^2.2.2",
- "gatsby-transformer-remark": "^2.7.1",
- "gatsby-transformer-sharp": "2.2.23",
+ "gatsby-remark-responsive-iframe": "^4.11.0",
+ "gatsby-remark-smartypants": "^4.11.0",
+ "gatsby-source-filesystem": "^3.14.0",
+ "gatsby-transformer-remark": "^4.11.0",
+ "gatsby-transformer-sharp": "^3.14.0",
"hast-util-select": "^4.0.0",
"husky": "^4.2.3",
- "jest": "^26.0.1",
- "lint-staged": "^10.1.2",
+ "jest": "^27.3.0",
+ "lint-staged": "^11.2.3",
"postcss-color-mod-function": "^3.0.3",
- "postcss-custom-media": "^7.0.8",
- "postcss-custom-properties": "^9.1.1",
- "postcss-mixins": "^6.2.3",
- "postcss-nested": "^4.2.1",
- "prettier": "^2.2.1",
- "rehype-parse": "^6.0.2",
- "rehype-stringify": "^7.0.0",
- "remark": "^12.0.0",
- "remark-html": "^11.0.1",
+ "postcss-custom-media": "^8.0.0",
+ "postcss-custom-properties": "^12.0.0",
+ "postcss-mixins": "^8.1.0",
+ "postcss-nested": "^5.0.6",
+ "prettier": "^2.4.1",
+ "rehype-parse": "^7.0.1",
+ "rehype-stringify": "^8.0.0",
+ "remark": "^13.0.0",
+ "remark-html": "^13.0.1",
"remark-parse": "^8.0.2",
"stylelint": "^13.3.0",
- "stylelint-config-standard": "^20.0.0",
+ "stylelint-config-standard": "^22.0.0",
"typescript": "^3.8.3",
- "unist-util-remove-position": "^2.0.1"
+ "unist-util-remove-position": "^3.0.0"
},
"husky": {
"hooks": {
diff --git a/plugins/gatsby-remark-dvc-linker/index.test.js b/plugins/gatsby-remark-dvc-linker/index.test.js
index fa52c1cd07..4cc73689cb 100644
--- a/plugins/gatsby-remark-dvc-linker/index.test.js
+++ b/plugins/gatsby-remark-dvc-linker/index.test.js
@@ -26,8 +26,8 @@ describe('gatsby-remark-dvc-linker', () => {
}
live = {
- inlineCode: '`dvclive.init()`',
- url: '[`dvclive.init()`](/doc/dvclive/api-reference/init)'
+ inlineCode: '`Live.log()`',
+ url: '[`Live.log()`](/doc/dvclive/api-reference/live/log)'
}
it('composes apiLinker and commandLinker', () => {
diff --git a/plugins/gatsby-remark-dvc-linker/liveLinker.js b/plugins/gatsby-remark-dvc-linker/liveLinker.js
index 5596d5eb51..2b5c4fe15e 100644
--- a/plugins/gatsby-remark-dvc-linker/liveLinker.js
+++ b/plugins/gatsby-remark-dvc-linker/liveLinker.js
@@ -3,9 +3,9 @@
const { createLinkNode } = require('./helpers')
const { getItemByPath } = require('../../src/utils/shared/sidebar')
-const LIVE_API_REGEXP = /dvclive.([a-z-._]*\(\)$)?/
+const LIVE_API_REGEXP = /Live.([a-z-._]*\(\)$)?/
const METHOD_REGEXP = /^[a-z-._]*\(\)$/
-const API_ROOT = '/doc/dvclive/api-reference/'
+const API_ROOT = '/doc/dvclive/api-reference/live/'
module.exports = astNode => {
const node = astNode[0]
diff --git a/scripts/deploy-with-s3.js b/scripts/deploy-with-s3.js
index 3dc199f17d..e91b1b1fe7 100755
--- a/scripts/deploy-with-s3.js
+++ b/scripts/deploy-with-s3.js
@@ -3,8 +3,9 @@
require('dotenv').config()
const path = require('path')
const PRODUCTION_PREFIX = 'dvc-org-prod'
+const { mkdirSync } = require('fs')
-const { DEPLOY_OPTIONS } = process.env
+const { DEPLOY_OPTIONS, USE_PRODUCTION_CACHE } = process.env
const clearCloudflareCache = require('./clear-cloudflare-cache')
// Generate deploy options from a comma separated string in the DEPLOY_OPTIONS
@@ -20,6 +21,7 @@ const deployOptions = DEPLOY_OPTIONS
: {
download: true,
build: true,
+ retry: true,
upload: true,
clean: true,
clearCloudflareCache: true
@@ -69,9 +71,8 @@ const {
cleanEntry
} = require('./s3-utils')
const { move } = require('fs-extra')
-const { downloadAllFromS3, uploadAllToS3, cleanAllLocal } = withEntries(
- cacheDirs
-)
+const { downloadAllFromS3, uploadAllToS3, cleanAllLocal } =
+ withEntries(cacheDirs)
function run(command) {
execSync(command, {
@@ -86,7 +87,10 @@ async function main() {
// This greatly speeds up PR initial build time.
if (deployOptions.download) {
- if (emptyPrefix) {
+ if (USE_PRODUCTION_CACHE) {
+ console.warn('USE_PRODUCTION_CACHE is set, downloading from production')
+ await downloadAllFromS3(PRODUCTION_PREFIX)
+ } else if (emptyPrefix) {
console.warn(
`The current prefix "${s3Prefix}" is empty! Attempting to fall back on production cache.`
)
@@ -94,24 +98,31 @@ async function main() {
} else {
await downloadAllFromS3(s3Prefix)
}
+ mkdirSync('.cache/json', { recursive: true })
}
if (deployOptions.build) {
try {
run('yarn build')
} catch (buildError) {
- // Sometimes gatsby build fails because of bad cache.
- // Clear it and try again.
-
- console.error('------------------------\n\n')
- console.error('The first Gatsby build attempt failed!\n')
- console.error(buildError)
- console.error('\nRetrying with a cleared cache:\n')
-
- // Clear only .cache so we re-use images
- await cleanEntry(cacheDirs[1])
-
- run('yarn build')
+ if (deployOptions.retry) {
+ // Sometimes gatsby build fails because of bad cache.
+ // Clear it and try again.
+
+ console.error('------------------------\n\n')
+ console.error('The first Gatsby build attempt failed!\n')
+ console.error(buildError)
+ console.error('\nRetrying with a cleared cache:\n')
+
+ // Clear only .cache so we re-use images
+ await cleanEntry(cacheDirs[1])
+
+ run('yarn build')
+ } else {
+ throw new Error(
+ 'The first Gatsby build attempt failed, and DEPLOY_OPTIONS does not include "retry"'
+ )
+ }
}
}
diff --git a/scripts/heroku-deploy.sh b/scripts/heroku-deploy.sh
new file mode 100755
index 0000000000..3ecfbe75a8
--- /dev/null
+++ b/scripts/heroku-deploy.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+NEWPWD="/tmp/gatsby-build"
+mv $OLDPWD $NEWPWD
+ln -s $NEWPWD $OLDPWD
+cd $NEWPWD
+./scripts/deploy-with-s3.js
diff --git a/src/components/Blog/Feed/Item/index.tsx b/src/components/Blog/Feed/Item/index.tsx
index 64b74e3108..e600e03b01 100644
--- a/src/components/Blog/Feed/Item/index.tsx
+++ b/src/components/Blog/Feed/Item/index.tsx
@@ -2,13 +2,13 @@ import React, { useEffect, useRef } from 'react'
import { useRafState, useWindowSize } from 'react-use'
import { graphql } from 'gatsby'
import Link from '../../../Link'
-import Image, { FixedObject, FluidObject } from 'gatsby-image'
+import { GatsbyImage, IGatsbyImageData } from 'gatsby-plugin-image'
import cn from 'classnames'
import { ISocialIcon } from '../../../SocialIcon'
import FeedMeta from '../../FeedMeta'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
import { ReactComponent as Placeholder } from './placeholder.svg'
@@ -21,13 +21,12 @@ export interface IBlogPostData {
description: string
descriptionLong: string
picture?: {
- big: FluidObject
- small: FluidObject
+ big: IGatsbyImageData
}
author: {
name: string
avatar: {
- fixed: FixedObject
+ gatsbyImageData: IGatsbyImageData
}
links: Array
}
@@ -55,7 +54,7 @@ const Item: React.FC = ({
}
}, [width])
- const image = picture ? (big ? picture.big : picture.small) : undefined
+ const image = picture?.big
return (
= ({
)}
>
- {picture ? (
-
diff --git a/src/components/Blog/FeedMeta/index.tsx b/src/components/Blog/FeedMeta/index.tsx
index 13b369d81d..45ad6bc80b 100644
--- a/src/components/Blog/FeedMeta/index.tsx
+++ b/src/components/Blog/FeedMeta/index.tsx
@@ -1,15 +1,15 @@
-import Image, { FixedObject } from 'gatsby-image'
+import { GatsbyImage, IGatsbyImageData } from 'gatsby-plugin-image'
import React from 'react'
import Link from '../../Link'
import { pluralizeComments } from '../../../utils/front/i18n'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
import SocialIcon, { ISocialIcon } from '../../SocialIcon'
interface IBlogFeedMetaProps {
avatar: {
- fixed: FixedObject
+ gatsbyImageData: IGatsbyImageData
}
commentsUrl?: string
commentsCount?: number
@@ -30,7 +30,11 @@ const FeedMeta: React.FC = ({
}) => {
return (
-
- {name} {links && ( diff --git a/src/components/Blog/FeedMeta/styles.module.css b/src/components/Blog/FeedMeta/styles.module.css index 306b6e5dfc..db8efcad97 100644 --- a/src/components/Blog/FeedMeta/styles.module.css +++ b/src/components/Blog/FeedMeta/styles.module.css @@ -37,9 +37,10 @@ margin-right: 14px; &::before { - content: '• '; + content: '•'; position: absolute; right: 100%; + width: 0.55em; } } diff --git a/src/components/Blog/Layout/index.tsx b/src/components/Blog/Layout/index.tsx index 3f8ad589d3..5bd1c8afc7 100644 --- a/src/components/Blog/Layout/index.tsx +++ b/src/components/Blog/Layout/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import SEO from '../../SEO' import MainLayout, { LayoutComponent } from '../../MainLayout' -import styles from './styles.module.css' +import * as styles from './styles.module.css' const keywords = 'git, data, version control, machine learning models management, datasets' diff --git a/src/components/Blog/Post/HeroPic/index.tsx b/src/components/Blog/Post/HeroPic/index.tsx index 4102feed28..3acb5ff4cd 100644 --- a/src/components/Blog/Post/HeroPic/index.tsx +++ b/src/components/Blog/Post/HeroPic/index.tsx @@ -1,40 +1,20 @@ -import Image from 'gatsby-image' +import { GatsbyImage, getImage } from 'gatsby-plugin-image' +import { IGatsbyImageDataParent } from 'gatsby-plugin-image/dist/src/components/hooks' import React from 'react' -import { BLOG } from '../../../../consts' -import { - IBlogPostHeroPic, - IGatsbyImageProps -} from '../../../../templates/blog-post' +import { IBlogPostHeroPic } from '../../../../templates/blog-post' -import styles from './styles.module.css' - -const NonStretchedImage: React.FC
- +
- {icon} {text} @@ -183,7 +190,9 @@ const FooterSocialIcons: React.FC = () => ( const LayoutFooter: React.FC = () => (
-
- {picture && (
-
-
+ {image && (
+
+
+ )}
{pictureComment && (
{
if (!triggerRect || !tooltipRect) {
diff --git a/src/components/Blog/Post/index.tsx b/src/components/Blog/Post/index.tsx
index c19d7236f7..9e6021b768 100644
--- a/src/components/Blog/Post/index.tsx
+++ b/src/components/Blog/Post/index.tsx
@@ -18,7 +18,7 @@ import Share from './Share'
import PageContent from '../../PageContent'
import SubscribeSection from '../../SubscribeSection'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const Post: React.FC = ({
html,
@@ -84,9 +84,7 @@ const Post: React.FC = ({
+
Subscribe to be up to date!{' '}
👇
diff --git a/src/components/Community/Events/styles.module.css b/src/components/Community/Events/styles.module.css
index 774f22a2ae..052796f99c 100644
--- a/src/components/Community/Events/styles.module.css
+++ b/src/components/Community/Events/styles.module.css
@@ -13,7 +13,6 @@
}
.eventsPlaceholder {
- composes: gray from '../styles.module.css';
text-align: center;
margin: auto;
font-size: 1rem;
diff --git a/src/components/Community/Hero/index.tsx b/src/components/Community/Hero/index.tsx
index badbd3c620..417f248900 100644
--- a/src/components/Community/Hero/index.tsx
+++ b/src/components/Community/Hero/index.tsx
@@ -6,7 +6,7 @@ import Link from '../../Link'
import { useCommunityData } from '../../../utils/front/community'
import { logEvent } from '../../../utils/front/ga'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const logHero = (): void => logEvent('community', 'hero')
diff --git a/src/components/Community/Learn/index.tsx b/src/components/Community/Learn/index.tsx
index 770417c89f..c4be7ef52f 100644
--- a/src/components/Community/Learn/index.tsx
+++ b/src/components/Community/Learn/index.tsx
@@ -15,8 +15,8 @@ import { useCommunityData } from '../../../utils/front/community'
import getPosts from '../../../queries/posts'
import { pluralizeComments } from '../../../utils/front/i18n'
-import sharedStyles from '../styles.module.css'
-import styles from './styles.module.css'
+import * as sharedStyles from '../styles.module.css'
+import * as styles from './styles.module.css'
const docsPage = getFirstPage()
@@ -27,7 +27,7 @@ const logDocumentationAll = (): void =>
interface ICommunityBlogPost {
color: string
commentsUrl?: string
- pictureUrl: string | null
+ pictureUrl?: string
date: string
title: string
url: string
@@ -45,9 +45,10 @@ const BlogPost: React.FC = ({
return null
}
- const logPost = useCallback(() => logEvent('community', 'blog', title), [
- title
- ])
+ const logPost = useCallback(
+ () => logEvent('community', 'blog', title),
+ [title]
+ )
const { error, ready, result } = useCommentsCount(commentsUrl)
diff --git a/src/components/Community/Meet/index.tsx b/src/components/Community/Meet/index.tsx
index 24da2de555..fcdce794df 100644
--- a/src/components/Community/Meet/index.tsx
+++ b/src/components/Community/Meet/index.tsx
@@ -16,8 +16,8 @@ import {
} from '../../../utils/front/api'
import { useCommunityData } from '../../../utils/front/community'
-import sharedStyles from '../styles.module.css'
-import styles from './styles.module.css'
+import * as sharedStyles from '../styles.module.css'
+import * as styles from './styles.module.css'
const logIssueAll = (): void => logEvent('community', 'issue', 'all')
const logTopicAll = (): void => logEvent('community', 'topic', 'all')
@@ -30,9 +30,10 @@ const Topic: React.FC<{ color: string } & IDiscussTopic> = ({
comments,
color
}) => {
- const logTopic = useCallback(() => logEvent('community', 'forum', title), [
- title
- ])
+ const logTopic = useCallback(
+ () => logEvent('community', 'forum', title),
+ [title]
+ )
return (
@@ -67,9 +68,10 @@ const Issue: React.FC<{ color: string } & IGithubIssue> = ({
comments,
color
}) => {
- const logIssue = useCallback(() => logEvent('community', 'issue', title), [
- title
- ])
+ const logIssue = useCallback(
+ () => logEvent('community', 'issue', title),
+ [title]
+ )
return (
@@ -82,7 +84,9 @@ const Issue: React.FC<{ color: string } & IGithubIssue> = ({
>
{title}
-
+
void
+ docsearch?: (opts: Record) => void
}
}
diff --git a/src/components/Documentation/Layout/SidebarMenu/index.tsx b/src/components/Documentation/Layout/SidebarMenu/index.tsx
index d48eac9390..f65ebf595a 100644
--- a/src/components/Documentation/Layout/SidebarMenu/index.tsx
+++ b/src/components/Documentation/Layout/SidebarMenu/index.tsx
@@ -20,7 +20,7 @@ import {
} from '../../../../utils/shared/sidebar'
import 'perfect-scrollbar/css/perfect-scrollbar.css'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
// A map for optional special icons that can be used in menu items
// Use the key string here as the "icon" field in sidebar.json
@@ -91,10 +91,12 @@ const SidebarMenuItem: React.FC = ({
isExpanded && styles.active,
isRootParent && 'docSearch-lvl0',
'link-with-focus',
- style ? styles[style] : styles.sidebarDefault,
- isLeafItem && styles.leafItem,
+ // style ? styles[style] : styles.sidebarDefault,
+ style && styles[style],
+ // isLeafItem && styles.leafItem,
// Limit the default bullet to items with no special icon
- icon ? undefined : styles.withDefaultBullet
+ // icon ? undefined : styles.withDefaultBullet
+ icon && undefined
)
const bulletIconClassName = cn(
diff --git a/src/components/Documentation/Layout/index.tsx b/src/components/Documentation/Layout/index.tsx
index 680ac9b28c..6e742a8910 100644
--- a/src/components/Documentation/Layout/index.tsx
+++ b/src/components/Documentation/Layout/index.tsx
@@ -9,7 +9,7 @@ import SidebarMenu from './SidebarMenu'
import { matchMedia } from '../../../utils/front/breakpoints'
import { focusElementWithHotkey } from '../../../utils/front/focusElementWithHotkey'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
import { useWindowSize } from 'react-use'
const Layout: LayoutComponent = ({ children, ...restProps }) => {
diff --git a/src/components/Documentation/Markdown/Main/index.tsx b/src/components/Documentation/Markdown/Main/index.tsx
index 91a815f455..41dc0b0dfb 100644
--- a/src/components/Documentation/Markdown/Main/index.tsx
+++ b/src/components/Documentation/Markdown/Main/index.tsx
@@ -7,8 +7,8 @@ import Tutorials from '../../TutorialsLinks'
import { getPathWithSource } from '../../../../utils/shared/sidebar'
import 'github-markdown-css/github-markdown.css'
-import sharedStyles from '../../styles.module.css'
-import styles from './styles.module.css'
+import * as sharedStyles from '../../styles.module.css'
+import * as styles from './styles.module.css'
const isInsideCodeBlock = (node: Element): boolean => {
while (node?.parentNode) {
diff --git a/src/components/Documentation/Markdown/ToggleProvider/index.tsx b/src/components/Documentation/Markdown/ToggleProvider/index.tsx
new file mode 100644
index 0000000000..7d4df78c6c
--- /dev/null
+++ b/src/components/Documentation/Markdown/ToggleProvider/index.tsx
@@ -0,0 +1,48 @@
+import React, { createContext, useState } from 'react'
+
+interface ITogglesData {
+ [key: string]: { texts: string[]; checkedInd: number }
+}
+
+interface ITogglesContext {
+ addNewToggle?: (id: string, texts: string[]) => void
+ updateToggleInd?: (id: string, newInd: number) => void
+ togglesData?: ITogglesData
+}
+
+export const TogglesContext = createContext({})
+
+export const TogglesProvider: React.FC = ({ children }) => {
+ const [togglesData, setTogglesData] = useState({})
+
+ const addNewToggle = (id: string, texts: string[]): void => {
+ const togglesDataCopy: ITogglesData = { ...togglesData }
+ togglesDataCopy[id] = { texts, checkedInd: 0 }
+ setTogglesData(togglesDataCopy)
+ }
+
+ const updateToggleInd = (id: string, newInd: number): void => {
+ const togglesDataCopy: ITogglesData = { ...togglesData }
+ const selectedTabText = togglesDataCopy[id].texts[newInd]
+ togglesDataCopy[id] = { ...togglesDataCopy[id], checkedInd: newInd }
+
+ for (const [toggleId, { texts }] of Object.entries(togglesDataCopy)) {
+ if (texts.includes(selectedTabText)) {
+ togglesDataCopy[toggleId] = {
+ ...togglesDataCopy[toggleId],
+ checkedInd: togglesDataCopy[id].texts.indexOf(selectedTabText)
+ }
+ }
+ }
+
+ setTogglesData(togglesDataCopy)
+ }
+
+ return (
+
+ {children}
+
+ )
+}
diff --git a/src/components/Documentation/Markdown/Tooltip/DesktopView/index.tsx b/src/components/Documentation/Markdown/Tooltip/DesktopView/index.tsx
index 4cc3fbc8fa..3a69b1bad1 100644
--- a/src/components/Documentation/Markdown/Tooltip/DesktopView/index.tsx
+++ b/src/components/Documentation/Markdown/Tooltip/DesktopView/index.tsx
@@ -4,7 +4,7 @@ import Portal from '@reach/portal'
import throttle from 'lodash/throttle'
import { getHeaderHeight } from '../../../../../utils/front/scroll'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IDesktopViewProps {
description: string
diff --git a/src/components/Documentation/Markdown/Tooltip/MobileView/index.tsx b/src/components/Documentation/Markdown/Tooltip/MobileView/index.tsx
index d54ddde90a..7c58dc58d4 100644
--- a/src/components/Documentation/Markdown/Tooltip/MobileView/index.tsx
+++ b/src/components/Documentation/Markdown/Tooltip/MobileView/index.tsx
@@ -4,7 +4,7 @@ import Portal from '@reach/portal'
import { isTriggeredFromKB } from '../../../../../utils/front/keyboard'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IMobileViewProps {
description: string
diff --git a/src/components/Documentation/Markdown/index.tsx b/src/components/Documentation/Markdown/index.tsx
index fc76f76243..4240a1c6ee 100644
--- a/src/components/Documentation/Markdown/index.tsx
+++ b/src/components/Documentation/Markdown/index.tsx
@@ -1,4 +1,12 @@
-import React, { ReactNode, ReactElement } from 'react'
+import React, {
+ useEffect,
+ useState,
+ ReactNode,
+ ReactElement,
+ useContext
+} from 'react'
+import { nanoid } from 'nanoid'
+import { Node } from 'unist'
import rehypeReact from 'rehype-react'
import Collapsible from 'react-collapsible'
@@ -6,12 +14,13 @@ import Main from './Main'
import Link from '../../Link'
import Tooltip from './Tooltip'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
+import { TogglesContext, TogglesProvider } from './ToggleProvider'
-const Details: React.FC<{
- children: Array<{ props: { children: ReactNode } } | string>
-}> = ({ children }) => {
- const filteredChildren: ReactNode[] = children.filter(child => child !== '\n')
+const Details: React.FC> = ({ children }) => {
+ const filteredChildren: ReactNode[] = (
+ children as Array<{ props: { children: ReactNode } } | string>
+ ).filter(child => child !== '\n')
const firstChild = filteredChildren[0] as JSX.Element
if (!/^h.$/.test(firstChild.type)) {
@@ -34,7 +43,7 @@ const Details: React.FC<{
*/
return (
{filteredChildren.slice(1)}
@@ -42,8 +51,8 @@ const Details: React.FC<{
)
}
-const Abbr: React.FC<{ children: [string] }> = ({ children }) => {
- return > = ({ children }) => {
+ return = ({
}) => {
return (
- {renderAst(htmlAst)}
+ {renderAst(htmlAst)}
)
}
diff --git a/src/components/Documentation/Markdown/styles.module.css b/src/components/Documentation/Markdown/styles.module.css
index 08f999dfb3..7c8f0f591c 100644
--- a/src/components/Documentation/Markdown/styles.module.css
+++ b/src/components/Documentation/Markdown/styles.module.css
@@ -118,3 +118,53 @@ a.card {
background-color: var(--color-light-blue);
}
}
+
+.toggle {
+ display: flex;
+ flex-wrap: wrap;
+
+ input {
+ height: 0;
+ opacity: 0;
+ position: absolute;
+ width: 0;
+ overflow: hidden;
+ }
+
+ input:checked + label {
+ color: var(--color-azure);
+ border-color: var(--color-azure);
+ }
+
+ input:checked + label + .tab {
+ height: initial;
+ opacity: initial;
+ position: static;
+ width: 100%;
+ overflow: visible;
+ }
+
+ .tabHeading {
+ padding: 12px 16px 10px;
+ background-color: transparent;
+ border: none;
+ border-bottom: 2px solid transparent;
+ font-weight: bold;
+ font-size: 16px;
+ font-family: var(--font-brandon);
+ order: -1;
+
+ &:hover {
+ cursor: pointer;
+ }
+ }
+}
+
+.tab {
+ margin: 10px 0 0;
+ height: 0;
+ opacity: 0;
+ position: absolute;
+ overflow: hidden;
+ width: 0;
+}
diff --git a/src/components/Documentation/RightPanel/index.tsx b/src/components/Documentation/RightPanel/index.tsx
index 3abb69ab39..ff7569d184 100644
--- a/src/components/Documentation/RightPanel/index.tsx
+++ b/src/components/Documentation/RightPanel/index.tsx
@@ -9,8 +9,8 @@ import Tutorials from '../TutorialsLinks'
import { getScrollPosition, getHeaderHeight } from '../../../utils/front/scroll'
import { allImagesLoadedInContainer } from '../../../utils/front/images'
-import sharedStyles from '../styles.module.css'
-import styles from './styles.module.css'
+import * as sharedStyles from '../styles.module.css'
+import * as styles from './styles.module.css'
interface IRightPanelProps {
headings: Array
diff --git a/src/components/Documentation/TutorialsLinks/index.tsx b/src/components/Documentation/TutorialsLinks/index.tsx
index 98e59c63aa..2539fec72b 100644
--- a/src/components/Documentation/TutorialsLinks/index.tsx
+++ b/src/components/Documentation/TutorialsLinks/index.tsx
@@ -5,8 +5,8 @@ import startCase from 'lodash/startCase'
import Link from '../../Link'
-import sharedStyles from '../styles.module.css'
-import styles from './styles.module.css'
+import * as sharedStyles from '../styles.module.css'
+import * as styles from './styles.module.css'
interface ITutorialsLinksProps {
compact?: boolean
diff --git a/src/components/Documentation/WithJSX/AutoLinkElement/index.tsx b/src/components/Documentation/WithJSX/AutoLinkElement/index.tsx
index f23c946855..d6f3b2fc2b 100644
--- a/src/components/Documentation/WithJSX/AutoLinkElement/index.tsx
+++ b/src/components/Documentation/WithJSX/AutoLinkElement/index.tsx
@@ -1,8 +1,8 @@
import React from 'react'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IElementProps {
- attributes?: object
+ attributes?: Record
el?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'span'
}
@@ -28,7 +28,7 @@ const Element: React.FC = ({ children, el, attributes }) => {
interface IAutoLinkHeaderProps {
id: string
el?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'span'
- anchorStyle?: object
+ anchorStyle?: Record
}
const AutoLinkElement: React.FC = ({
diff --git a/src/components/Documentation/index.tsx b/src/components/Documentation/index.tsx
index 88c2cf480f..a2d9c3e175 100644
--- a/src/components/Documentation/index.tsx
+++ b/src/components/Documentation/index.tsx
@@ -1,4 +1,5 @@
import React from 'react'
+import { Node } from 'unist'
import Markdown from './Markdown'
import RightPanel from './RightPanel'
@@ -16,7 +17,7 @@ export const getGithubLink = (source: string): string =>
interface IDocumentationProps {
path: string
headings: Array
- htmlAst: object
+ htmlAst: Node
}
const Documentation: React.FC = ({
diff --git a/src/components/DownloadButton/index.tsx b/src/components/DownloadButton/index.tsx
index 9916965e11..d2472d71f7 100644
--- a/src/components/DownloadButton/index.tsx
+++ b/src/components/DownloadButton/index.tsx
@@ -7,9 +7,9 @@ import Link from '../Link'
import isClient from '../../utils/front/isClient'
import { logEvent } from '../../utils/front/ga'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
-const VERSION = `2.7.4`
+const VERSION = `2.8.1`
enum OS {
UNKNOWN = '...',
@@ -78,44 +78,44 @@ const getUserOS = (): OS => {
return OSName
}
-const DownloadButtonDropdownItems: React.FC = ({
- onClick,
- userOS
-}) => {
- return (
- = ({ openTop }) => {
const userOS = useRef(getUserOS())
diff --git a/src/components/Features/index.tsx b/src/components/Features/index.tsx
index 51758a796d..b597839986 100644
--- a/src/components/Features/index.tsx
+++ b/src/components/Features/index.tsx
@@ -6,7 +6,7 @@ import HeroSection from '../HeroSection'
import Link from '../Link'
import PromoSection from '../PromoSection'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const FeaturesPage: React.FC = () => (
<>
diff --git a/src/components/HamburgerIcon/index.tsx b/src/components/HamburgerIcon/index.tsx
index 005e61dc31..caedcea2ca 100644
--- a/src/components/HamburgerIcon/index.tsx
+++ b/src/components/HamburgerIcon/index.tsx
@@ -1,7 +1,7 @@
import cn from 'classnames'
import React from 'react'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IHamburgerProps {
opened?: boolean
diff --git a/src/components/HamburgerMenu/index.tsx b/src/components/HamburgerMenu/index.tsx
index d1e60b4abd..3b1ec70332 100644
--- a/src/components/HamburgerMenu/index.tsx
+++ b/src/components/HamburgerMenu/index.tsx
@@ -10,7 +10,7 @@ import { ReactComponent as LogoSVG } from '../../../static/img/logo-white.svg'
import { ReactComponent as TwitterIcon } from '../SocialIcon/twitter.svg'
import { ReactComponent as GithubIcon } from '../SocialIcon/github.svg'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const docsPage = getFirstPage()
@@ -245,7 +245,7 @@ export const HamburgerMenu: React.FC<
>
Studio
@@ -255,7 +255,7 @@ export const HamburgerMenu: React.FC<
DVC
@@ -265,7 +265,7 @@ export const HamburgerMenu: React.FC<
CML
diff --git a/src/components/HeroSection/index.tsx b/src/components/HeroSection/index.tsx
index 29aa072ab3..0fa5bf1b0d 100644
--- a/src/components/HeroSection/index.tsx
+++ b/src/components/HeroSection/index.tsx
@@ -3,7 +3,7 @@ import cn from 'classnames'
import LayoutWidthContainer from '../LayoutWidthContainer'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IHeroSectionProps {
className?: string
diff --git a/src/components/Home/Diagram/index.tsx b/src/components/Home/Diagram/index.tsx
index 6f631cd8cf..bf180dfb59 100644
--- a/src/components/Home/Diagram/index.tsx
+++ b/src/components/Home/Diagram/index.tsx
@@ -8,7 +8,7 @@ import Link from '../../Link'
import 'slick-carousel/slick/slick.css'
import 'slick-carousel/slick/slick-theme.css'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const LearnMore: React.FC<{ href: string }> = ({ href }) => (
+ {tabs.map((tab, i) => (
+ updateToggleInd(toggleId, i)}
+ >
+ {tab}
+
+ ))}
+
+ )
+}
+
+const Tab: React.FC = ({ children }) => (
+ {children}
+)
+
+// Rehype's typedefs don't allow for custom components, even though they work
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const renderAst = new (rehypeReact as any)({
+ createElement: React.createElement,
Fragment: React.Fragment,
components: {
- details: Details,
- abbr: Abbr,
a: Link,
+ abbr: Abbr,
card: Card,
- cards: Cards
+ cards: Cards,
+ details: Details,
+ toggle: Toggle,
+ tab: Tab
}
}).Compiler
interface IMarkdownProps {
- htmlAst: object
+ htmlAst: Node
githubLink: string
tutorials: { [type: string]: string }
prev?: string
@@ -125,7 +215,7 @@ const Markdown: React.FC
- {dropdownItems.map((os, index) => {
- if (os === null) {
+const DownloadButtonDropdownItems: React.FC =
+ ({ onClick, userOS }) => {
+ return (
+
+ )
+ }
const DownloadButton: React.FC
+ {dropdownItems.map((os, index) => {
+ if (os === null) {
+ return (
+
+ )
+ }
+
+ const item = itemsByOs[os]
+
return (
-
+ onClick(os)}
+ >
+ {item.title}
+
)
- }
-
- const item = itemsByOs[os]
-
- return (
- onClick(os)}
- >
- {item.title}
-
- )
- })}
-
- )
-}
+ })}
+
Studio
@@ -255,7 +255,7 @@ export const HamburgerMenu: React.FC<
DVC
@@ -265,7 +265,7 @@ export const HamburgerMenu: React.FC<
CML
diff --git a/src/components/HeroSection/index.tsx b/src/components/HeroSection/index.tsx
index 29aa072ab3..0fa5bf1b0d 100644
--- a/src/components/HeroSection/index.tsx
+++ b/src/components/HeroSection/index.tsx
@@ -3,7 +3,7 @@ import cn from 'classnames'
import LayoutWidthContainer from '../LayoutWidthContainer'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface IHeroSectionProps {
className?: string
diff --git a/src/components/Home/Diagram/index.tsx b/src/components/Home/Diagram/index.tsx
index 6f631cd8cf..bf180dfb59 100644
--- a/src/components/Home/Diagram/index.tsx
+++ b/src/components/Home/Diagram/index.tsx
@@ -8,7 +8,7 @@ import Link from '../../Link'
import 'slick-carousel/slick/slick.css'
import 'slick-carousel/slick/slick-theme.css'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const LearnMore: React.FC<{ href: string }> = ({ href }) => (
diff --git a/src/components/Home/LandingHero/GithubLine/index.tsx b/src/components/Home/LandingHero/GithubLine/index.tsx
index a6d4d48e7c..947596de5a 100644
--- a/src/components/Home/LandingHero/GithubLine/index.tsx
+++ b/src/components/Home/LandingHero/GithubLine/index.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import Link from '../../../Link'
import useStars from '../../../../gatsby/hooks/stars'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const GithubLine: React.FC = () => {
const stars = useStars()
@@ -15,7 +15,9 @@ const GithubLine: React.FC = () => {
GitHub
{stars && (
-
+
{stars}
diff --git a/src/components/Home/LandingHero/index.tsx b/src/components/Home/LandingHero/index.tsx
index 29dcf67b27..6372db4582 100644
--- a/src/components/Home/LandingHero/index.tsx
+++ b/src/components/Home/LandingHero/index.tsx
@@ -9,7 +9,7 @@ import GithubLine from './GithubLine'
import { scrollIntoLayout, ease } from '../../../utils/front/scroll'
import { logEvent } from '../../../utils/front/ga'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface ILandingHeroProps {
scrollToRef: React.RefObject
diff --git a/src/components/Home/LearnMore/index.tsx b/src/components/Home/LearnMore/index.tsx
index 2760190d81..e02e70d07b 100644
--- a/src/components/Home/LearnMore/index.tsx
+++ b/src/components/Home/LearnMore/index.tsx
@@ -3,7 +3,7 @@ import React, { useCallback } from 'react'
import { logEvent } from '../../../utils/front/ga'
import { scrollIntoLayout, ease } from '../../../utils/front/scroll'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface ILearnMoreProps {
scrollToRef: React.RefObject
diff --git a/src/components/Home/UseCases/CollapsibleText/index.tsx b/src/components/Home/UseCases/CollapsibleText/index.tsx
index 0e11146e9d..b91c2eaa01 100644
--- a/src/components/Home/UseCases/CollapsibleText/index.tsx
+++ b/src/components/Home/UseCases/CollapsibleText/index.tsx
@@ -3,7 +3,7 @@ import { Collapse } from 'react-collapse'
import { isTriggeredFromKB } from '../../../../utils/front/keyboard'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface ICollapsibleTextProps {
children: React.ReactNode
diff --git a/src/components/Home/UseCases/Video/index.tsx b/src/components/Home/UseCases/Video/index.tsx
index b9d85b2e09..250709e995 100644
--- a/src/components/Home/UseCases/Video/index.tsx
+++ b/src/components/Home/UseCases/Video/index.tsx
@@ -3,7 +3,7 @@ import React, { useState, useCallback } from 'react'
import TwoRowsButton from '../../../TwoRowsButton'
import { logEvent } from '../../../../utils/front/ga'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const Video: React.FC<{ id: string }> = ({ id }) => {
const [isWatching, setWatching] = useState(false)
diff --git a/src/components/Home/UseCases/index.tsx b/src/components/Home/UseCases/index.tsx
index 2d6f9ea4d7..37fb4968c7 100644
--- a/src/components/Home/UseCases/index.tsx
+++ b/src/components/Home/UseCases/index.tsx
@@ -5,7 +5,7 @@ import CollapsibleText from './CollapsibleText'
import LayoutWidthContainer from '../../LayoutWidthContainer'
import ShowOnly from '../../ShowOnly'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const Heading1: React.FC = () => (
{stars}
diff --git a/src/components/Home/LandingHero/index.tsx b/src/components/Home/LandingHero/index.tsx
index 29dcf67b27..6372db4582 100644
--- a/src/components/Home/LandingHero/index.tsx
+++ b/src/components/Home/LandingHero/index.tsx
@@ -9,7 +9,7 @@ import GithubLine from './GithubLine'
import { scrollIntoLayout, ease } from '../../../utils/front/scroll'
import { logEvent } from '../../../utils/front/ga'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
interface ILandingHeroProps {
scrollToRef: React.RefObject
@@ -86,15 +86,15 @@ const UseCases: React.ForwardRefRenderFunction = (_, ref) => {
-
+
+
+
= (_, ref) => {
-
-
+
+
+
+
(null)
diff --git a/src/components/LayoutFooter/index.tsx b/src/components/LayoutFooter/index.tsx
index 3f352cc01e..e78cfd09a9 100644
--- a/src/components/LayoutFooter/index.tsx
+++ b/src/components/LayoutFooter/index.tsx
@@ -7,15 +7,15 @@ import SocialIcon, { ISocialIcon } from '../SocialIcon'
import ShowOnly from '../ShowOnly'
import { getFirstPage } from '../../utils/shared/sidebar'
-import { ReactComponent as LogoSVG } from '../../../static/img/logo.svg'
+import { ReactComponent as LogoSVG } from '../../../static/img/dvc_icon-color--square_vector.svg'
import { ReactComponent as GithubSVG } from '../SocialIcon/github.svg'
import { ReactComponent as TwitterSVG } from '../SocialIcon/twitter.svg'
import { ReactComponent as DiscordSVG } from '../SocialIcon/discord.svg'
-import { ReactComponent as CmlSVG } from '../../../static/img/cml-icon.svg'
-import { ReactComponent as StudioSVG } from '../../../static/img/studio-icon.svg'
-import { ReactComponent as IterativeSVG } from '../../../static/img/iterative-icon.svg'
+import { ReactComponent as CmlSVG } from '../../../static/img/cml_icon-color--square_vector.svg'
+import { ReactComponent as StudioSVG } from '../../../static/img/studio_icon-color--square_vector.svg'
+import { ReactComponent as IterativeSVG } from '../../../static/img/iterative_icon-color--square_vector.svg'
-import styles from './styles.module.css'
+import * as styles from './styles.module.css'
const docsPage = getFirstPage()
@@ -91,6 +91,10 @@ const footerListsData: Array = [
href: 'https://iterative.ai/about#career',
text: 'Career',
target: '_blank'
+ },
+ {
+ href: 'https://iterative.ai/brand',
+ text: 'Media Kit'
}
]
},
@@ -153,7 +157,10 @@ const FooterLists: React.FC = () => (
{header}
-
{links.map(({ text, target, href, icon }, i) => (
-