Skip to content

Commit

Permalink
chore: merge docs from master to develop (medusajs#3650)
Browse files Browse the repository at this point in the history
* Fix issue on fixed total amount discount when using includes tax (medusajs#3472)

The calculation of the fixed discount amount breaks when having includes_tax setting active, due to the line item totals are incorrect and returning everything as 0, thus the totalItemPercentage will be Infinitiy due to the division by a subtotal of 0

* chore: Add missing changeset for @medusajs/medusa

* feat(medusa): Improve performance of Products domain (medusajs#3417)

* feat(medusa): Improve product update performances

* fix tests and update

* update mock repo

* improve repo

* cleanup

* fix

* cleanup + bulk emit + unit test fix

* improvements

* improve

* fix unit tests

* fix export

* fix product update handler

* enhance mock repo

* fix import integration

* fix end point tests

* revert mock repo product variant

* fix unit

* cleanup

* cleanup

* address feedback

* fix quotes in tests

* address feedback

* Create new-tips-mate.md

* use types

* chore: Remove integration-tests from changeset

* chore(release): v1.7.14

* chore(docs): Generated Docs Announcement Bar (automated) (medusajs#3489)

Co-authored-by: olivermrbl <[email protected]>

* fix(medusa): EventBusService.emit using Redis mock (medusajs#3491)

* Fix eventBusService.emit using redis mock

* revert gitignore

* enqueuer

* unit test add redis_url

* fix test

* chore(docs): Generated Services Reference (automated) (medusajs#3490)

Co-authored-by: olivermrbl <[email protected]>

* docs: publish restructure (medusajs#3496)

* docs: added features and guides overview page

* added image

* added version 2

* added version 3

* added version 4

* docs: implemented new color scheme

* docs: redesigned sidebar (medusajs#3193)

* docs: redesigned navbar for restructure (medusajs#3199)

* docs: redesigned footer (medusajs#3209)

* docs: redesigned cards (medusajs#3230)

* docs: redesigned admonitions (medusajs#3231)

* docs: redesign announcement bar (medusajs#3236)

* docs: redesigned large cards (medusajs#3239)

* docs: redesigned code blocks (medusajs#3253)

* docs: redesigned search modal and page (medusajs#3264)

* docs: redesigned doc footer (medusajs#3268)

* docs: added new sidebars + refactored css and assets (medusajs#3279)

* docs: redesigned api reference sidebar

* docs: refactored css

* docs: added code tabs transition

* docs: added new sidebars

* removed unused assets

* remove unusued assets

* Fix deploy errors

* fix incorrect link

* docs: fixed code responsivity + missing icons (medusajs#3283)

* docs: changed icons (medusajs#3296)

* docs: design fixes to the sidebar (medusajs#3297)

* redesign fixes

* docs: small design fixes

* docs: several design fixes after restructure (medusajs#3299)

* docs: bordered icon fixes

* docs: desgin fixes

* fixes to code blocks and sidebar scroll

* design adjustments

* docs: restructured homepage (medusajs#3305)

* docs: restructured homepage

* design fixes

* fixed core concepts icon

* docs: added core concepts page (medusajs#3318)

* docs: restructured homepage

* design fixes

* docs: added core concepts page

* changed text of different components

* docs: added architecture link

* added missing prop for user guide

* docs: added regions overview page (medusajs#3327)

* docs: added regions overview

* moved region pages to new structure

* docs: fixed description of regions architecture page

* small changes

* small fix

* docs: added customers overview page (medusajs#3331)

* docs: added regions overview

* moved region pages to new structure

* docs: fixed description of regions architecture page

* small changes

* small fix

* docs: added customers overview page

* fix link

* resolve link issues

* docs: updated regions architecture image

* docs: second-iteration fixes (medusajs#3347)

* docs: redesigned document

* design fixes

* docs: added products overview page (medusajs#3354)

* docs: added carts overview page (medusajs#3363)

* docs: added orders overview (medusajs#3364)

* docs: added orders overview

* added links in overview

* docs: added vercel redirects

* docs: added soon badge for cards (medusajs#3389)

* docs: resolved feedback changes + organized troubleshooting pages (medusajs#3409)

* docs: resolved feedback changes

* added extra line

* docs: changed icons for restructure (medusajs#3421)

* docs: added taxes overview page (medusajs#3422)

* docs: added taxes overview page

* docs: fix sidebar label

* added link to taxes overview page

* fixed link

* docs: fixed sidebar scroll (medusajs#3429)

* docs: added discounts overview (medusajs#3432)

* docs: added discounts overview

* fixed links

* docs: added gift cards overview (medusajs#3433)

* docs: added price lists overview page (medusajs#3440)

* docs: added price lists overview page

* fixed links

* docs: added sales channels overview page (medusajs#3441)

* docs: added sales overview page

* fixed links

* docs: added users overview (medusajs#3443)

* docs: fixed sidebar border height (medusajs#3444)

* docs: fixed sidebar border height

* fixed svg markup

* docs: added possible solutions to feedback component (medusajs#3449)

* docs: added several overview pages + restructured files (medusajs#3463)

* docs: added several overview pages

* fixed links

* docs: added feature flags + PAK overview pages (medusajs#3464)

* docs: added feature flags + PAK overview pages

* fixed links

* fix link

* fix link

* fixed links colors

* docs: added strategies overview page (medusajs#3468)

* docs: automated upgrade guide (medusajs#3470)

* docs: automated upgrade guide

* fixed vercel redirect

* docs: restructured files in docs codebase (medusajs#3475)

* docs: restructured files

* docs: fixed eslint exception

* docs: finished restructure loose-ends (medusajs#3493)

* fixed uses of backend

* docs: finished loose ends

* eslint fixes

* fixed links

* merged master

* added update instructions for v1.7.12

* docs: fixed discount details (medusajs#3499)

* docs: fix trailing slash causing 404 (medusajs#3508)

* docs: fix error during navigation (medusajs#3509)

* docs: removed the gatsby storefront guide (medusajs#3527)

* docs: removed the gatsby storefront guide

* docs: fixed query value

* chore(docs): Removed Docs Announcement Bar (automated) (medusajs#3536)

Co-authored-by: shahednasser <[email protected]>

* fix(medusa): Variant update should include the id for the listeners to be able to identify the entity (medusajs#3539)

* fix(medusa): Variant update should include the id for the listeners to be able to identify the entity

* fix unit tests

* Create brave-seahorses-film.md

* docs: fix admin redirects (medusajs#3548)

* chore(release): v1.7.15

* chore(docs): Generated Docs Announcement Bar (automated) (medusajs#3550)

Co-authored-by: olivermrbl <[email protected]>

* chore(docs): Generated Services Reference (automated) (medusajs#3551)

Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action

Co-authored-by: Oliver Windall Juhl <[email protected]>

* chore: updated READMEs of plugins (medusajs#3546)

* chore: updated READMEs of plugins

* added notice to plugins

* docs: added a deploy guide for next.js storefront (medusajs#3558)

* docs: added a deploy next.js guide

* docs: fix image zoom

* docs: fixes to next.js deployment guide to vercel (medusajs#3562)

* chore(workflows): Enable manual workflow in pre-release mode (medusajs#3566)

* chore(docs): Removed Docs Announcement Bar (automated) (medusajs#3598)

Co-authored-by: shahednasser <[email protected]>

* fix(medusa): Rounding issues on line item adjustments (medusajs#3446)

* chores(medusa): Attempt to fix discount rounding issues

* add migration

* update entities

* apply multipler factor properly

* fix discount service

* WIP

* fix rounding issues in discounts

* fix some tests

* Exclude raw_discount_total from responses

* fix adjustments

* cleanup response

* fix

* fix draft order integration

* fix order integration

* fix order integration

* address feedback

* fix test

* Create .changeset/polite-llamas-sit.md

* remove comment

---------

Co-authored-by: Oliver Windall Juhl <[email protected]>

* chore(workflows): Add release notification (medusajs#3629)

---------

Co-authored-by: pepijn-vanvlaanderen <[email protected]>
Co-authored-by: olivermrbl <[email protected]>
Co-authored-by: Adrien de Peretti <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: olivermrbl <[email protected]>
Co-authored-by: Carlos R. L. Rodrigues <[email protected]>
Co-authored-by: shahednasser <[email protected]>
Co-authored-by: Oliver Windall Juhl <[email protected]>
  • Loading branch information
9 people authored Mar 31, 2023
1 parent e6b5859 commit 6f1b49a
Show file tree
Hide file tree
Showing 476 changed files with 14,056 additions and 6,520 deletions.
4 changes: 2 additions & 2 deletions docs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = {
"max-len": [
"error",
{
code: 75,
code: 64,
},
],
semi: ["error", "never"],
Expand Down Expand Up @@ -86,7 +86,7 @@ module.exports = {
},
ignorePatterns: [
'docs/content/references/**',
'docs/content/advanced/backend/subscribers/events-list.md'
'docs/content/**/events-list.md'
],
overrides: [
{
Expand Down
4 changes: 2 additions & 2 deletions docs/content/admin/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ In this document, you’ll learn how to:

### Required Tools

[Git CLI tool](../tutorial/0-set-up-your-development-environment.mdx#git)
[Git CLI tool](../development/backend/prepare-environment.mdx#git)

### Required Accounts

Expand Down Expand Up @@ -102,4 +102,4 @@ If your forked repository doesn’t have any conflicts with the changes from the
## See Also

- [Admin API reference](/api/admin).
- [Local development of the Medusa server](../usage/local-development.md).
- [Local development with Medusa](../development/fundamentals/local-development.md).
30 changes: 15 additions & 15 deletions docs/content/admin/quickstart.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ This document will guide you through setting up the Medusa admin in minutes, as

## Prerequisites

### Medusa Server
### Medusa Backend

The Medusa admin is connected to the Medusa server. So, make sure to install the Medusa server first before proceeding with the admin. You can check out the [quickstart guide to install the Medusa server](../quickstart/quick-start).
The Medusa admin is connected to the Medusa backend. So, make sure to install the Medusa backend first before proceeding with the admin. You can check out the [quickstart guide to install the Medusa backend](../development/backend/install.mdx).

:::tip

If you’re not very familiar with Medusa’s architecture, you can learn more about it in the [Architecture Overview](../introduction#architecture-overview).
If you’re not very familiar with Medusa’s architecture, you can learn more about it in the [Architecture Overview](../development/fundamentals/architecture-overview.md).

:::

Expand All @@ -37,8 +37,8 @@ You can install Node from the [official website](https://nodejs.org/en/).

Instead of manually following this guide to install then later deploy the Medusa Admin, you can deploy the Medusa Admin to Netlify with this button:

<a href="https://app.netlify.com/start/deploy?repository=https://github.com/medusajs/admin" class="img-url">
<img src="https://www.netlify.com/img/deploy/button.svg" alt="Deploy to Netlify" class="no-zoom-img" />
<a href="https://app.netlify.com/start/deploy?repository=https://github.com/medusajs/admin" className="img-url">
<img src="https://www.netlify.com/img/deploy/button.svg" alt="Deploy to Netlify" className="no-zoom-img" />
</a>

---
Expand Down Expand Up @@ -81,11 +81,11 @@ If you run into errors during the installation, check out [this troubleshooting

## Test it Out

Before running your Medusa admin, make sure that your Medusa server is running.
Before running your Medusa admin, make sure that your Medusa backend is running.

:::tip

To run your Medusa server, go to the directory holding the server and run:
To run your Medusa backend, go to the directory holding the backend and run:

```bash npm2yarn
npm run start
Expand All @@ -107,7 +107,7 @@ Use your Medusa admin’s user credentials to log in.

### Demo Credentials

If you installed the demo data when you installed the Medusa server by using the `--seed` option or running:
If you installed the demo data when you installed the Medusa backend by using the `--seed` option or running:

```bash npm2yarn
npm run seed
Expand All @@ -125,7 +125,7 @@ Passwords in Medusa are hashed using the [scrypt-kdf](https://www.npmjs.com/pack

## Create a New Admin User

To create a new admin user from the command line, run the following command in the directory holding your Medusa server:
To create a new admin user from the command line, run the following command in the directory holding your Medusa backend:

```bash
medusa user -e [email protected] -p some-password
Expand All @@ -145,9 +145,9 @@ The default port is set in `package.json` in the `dev` script:

If you wish to change the port you can simply change the `7000` to your desired port.

However, if you change your Medusa admin port, you need to change it in your Medusa server. The Medusa server has the Medusa admin and store URLs set in the configurations to avoid Cross-Origin Resource Sharing (CORS) issues.
However, if you change your Medusa admin port, you need to change it in your Medusa backend. The Medusa backend has the Medusa admin and store URLs set in the configurations to avoid Cross-Origin Resource Sharing (CORS) issues.

To change the URL of the Medusa admin in the server, add a new environment variable `ADMIN_CORS` or modify it if you already have it to your Admin URL:
To change the URL of the Medusa admin in the backend, add a new environment variable `ADMIN_CORS` or modify it if you already have it to your Admin URL:

```bash
ADMIN_CORS=<YOUR_ADMIN_URL>
Expand All @@ -157,7 +157,7 @@ Make sure to replace `<YOUR_ADMIN_URL>` with your URL.

:::info

For more details about the Admin CORS configuration, check out the [Configure your Server documentation](../usage/configurations.md#admin-cors).
For more details about the Admin CORS configuration, check out the [Configure your Backend documentation](../development/backend/configurations.md#admin-cors).

:::

Expand All @@ -167,12 +167,12 @@ For more details about the Admin CORS configuration, check out the [Configure yo

Medusa admin provides a lot of ecommerce features including managing Return Merchandise Authorization (RMA) flows, store settings, products, orders, and much more.

You can learn more about Medusa admin and its features in the [User Guide](../user-guide/index.mdx).
You can learn more about Medusa admin and its features in the [User Guide](../user-guide.mdx).

---

## See Also

- [Customize Medusa Admin](./development.md)
- Install the [Next.js](../starters/nextjs-medusa-starter.mdx) or [Gatsby](../starters/gatsby-medusa-starter.mdx) storefront starters.
- [Use `create-medusa-app` to install all of Medusa’s 3 components.](../usage/create-medusa-app.mdx)
- Install the [Next.js](../starters/nextjs-medusa-starter.mdx) storefront starter.
- [Use `create-medusa-app` to install all of Medusa’s 3 components.](../create-medusa-app.mdx)
115 changes: 0 additions & 115 deletions docs/content/advanced/backend/publishable-api-keys/index.md

This file was deleted.

30 changes: 0 additions & 30 deletions docs/content/advanced/backend/services/overview.md

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions docs/content/advanced/backend/upgrade-guides/index.mdx

This file was deleted.

24 changes: 0 additions & 24 deletions docs/content/advanced/backend/upgrade-guides/medusa-core/1-7-6.md

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6f1b49a

Please sign in to comment.