-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #335 from PrestaShopCorp/ACCOUNT-1795/feat/add-reb…
…randing-to-5.x [ACCOUNT-1795] Add rebranding to 5.x & use same front end setup as 6.x
- Loading branch information
Showing
69 changed files
with
2,169 additions
and
13,308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,20 +12,45 @@ jobs: | |
| - name: Checkout | ||
| uses: actions/[email protected] | ||
|
|
||
| - name: Setup node env 🏗 | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18 | ||
| registry-url: 'https://registry.npmjs.org' | ||
| scope: '@prestashopcorp' | ||
|
|
||
| - name: Bump version | ||
| run: | | ||
| VERSION=$(echo "${{ github.event.release.tag_name }}" | sed 's/^v//' | cut -d'-' -f1) \ | ||
| make version | ||
| - name: Build JS dependencies | ||
| uses: PrestaShopCorp/github-action-build-js/[email protected] | ||
| with: | ||
| cmd: yarn | ||
| path: ./_dev | ||
|
|
||
| - name: Install composer dependencies | ||
| run: composer install --no-dev -o | ||
|
|
||
| - name: Get yarn cache directory path 🛠 | ||
| id: yarn-cache-dir-path | ||
| run: echo "::set-output name=dir::$(yarn cache dir)" | ||
| working-directory: ./_dev | ||
|
|
||
| - name: Cache node_modules 📦 | ||
| uses: actions/cache@v2 | ||
| id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) | ||
| with: | ||
| path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
| key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-yarn- | ||
| - name: Install _dev dependencies 👨🏻💻 | ||
| working-directory: ./_dev | ||
| run: yarn --frozen-lockfile --silent | ||
| env: | ||
| NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_RO }} | ||
|
|
||
| - name: Build apps | ||
| working-directory: ./_dev | ||
| run: yarn build | ||
|
|
||
| - name: Clean-up project | ||
| uses: PrestaShopCorp/[email protected] | ||
|
|
||
|
|
@@ -140,4 +165,4 @@ jobs: | |
| run: | | ||
| ~/.composer/vendor/bin/publish-on-marketplace --archive=$PWD/${{ github.event.repository.name }}.zip --metadata-json=$PWD/.github/mktp-metadata.json --changelog="${{ github.event.release.body }}" --debug | ||
| env: | ||
| MARKETPLACE_API_KEY: ${{ secrets.MARKETPLACE_API_KEY }} | ||
| MARKETPLACE_API_KEY: ${{ secrets.MARKETPLACE_API_KEY }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| lts/erbium | ||
| v18 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,14 @@ | ||
| module.exports = { | ||
| root: true, | ||
| env: { | ||
| node: true, | ||
| }, | ||
| parserOptions: { | ||
| ecmaVersion: 6, | ||
| ecmaFeatures: { | ||
| experimentalObjectRestSpread: true, | ||
| jsx: true, | ||
| }, | ||
| sourceType: "module", | ||
| parser: "babel-eslint", | ||
| }, | ||
| extends: [ | ||
| "prestashop", | ||
| "plugin:vue/strongly-recommended", | ||
| "eslint:recommended", | ||
| "plugin:prettier/recommended", | ||
| "prettier/vue", | ||
| ], | ||
| plugins: ["import", "vue", "prettier"], | ||
| extends: ['@vue/typescript/recommended', 'plugin:vue/vue3-recommended', 'prettier'], | ||
| rules: { | ||
| "prettier/prettier": ["warn"], | ||
| "vue/component-name-in-template-casing": ["error", "PascalCase"], | ||
| "no-console": process.env.NODE_ENV === "production" ? "error" : "off", | ||
| "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off", | ||
| "template-curly-spacing": "off", | ||
| indent: "off", | ||
| "no-param-reassign": ["error", { props: false }], | ||
| "prefer-destructuring": ["error", { object: true, array: false }], | ||
| "import/no-extraneous-dependencies": [ | ||
| "error", | ||
| indent: ['error', 2], | ||
| 'vue/multi-word-component-names': 'off', | ||
| indent: [ | ||
| 'error', | ||
| 2, | ||
| { | ||
| devDependencies: [".storybook/**", "./src/stories/**"], | ||
| SwitchCase: 1, | ||
| }, | ||
| ], | ||
| }, | ||
| overrides: [ | ||
| { | ||
| files: ["*.vue"], | ||
| rules: { | ||
| indent: 0, | ||
| }, | ||
| }, | ||
| ], | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,6 @@ docs | |
| doc | ||
| website | ||
| images | ||
| assets | ||
|
|
||
| # examples | ||
| example | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <link rel="icon" href="/favicon.ico" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>Vite App</title> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| <script type="module" src="/src/main.js"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| const autoprefixer = require("autoprefixer"); | ||
| const tailwindcss = require("tailwindcss"); | ||
|
|
||
| module.exports = { | ||
| plugins: [tailwindcss, autoprefixer], | ||
| }; | ||
| plugins: { | ||
| tailwindcss: {}, | ||
| autoprefixer: {}, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <!--** | ||
| * 2007-2022 PrestaShop and Contributors | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Academic Free License 3.0 (AFL-3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * https://opensource.org/licenses/AFL-3.0 | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to license@prestashop.com so we can send you a copy immediately. | ||
| * | ||
| * @author PrestaShop SA <contact@prestashop.com> | ||
| * @copyright 2007-2022 PrestaShop SA and Contributors | ||
| * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| *--> | ||
| <template> | ||
| <div id="settingsApp"> | ||
| <div class="onboarding"> | ||
| <section class="onboarding-header"> | ||
| <ConfigInformation /> | ||
| </section> | ||
|
|
||
| <section class="onboarding-content"> | ||
| <prestashop-accounts></prestashop-accounts> | ||
| </section> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import ConfigInformation from "@/components/ConfigInformation.vue"; | ||
| import { onMounted } from "vue"; | ||
|
|
||
| onMounted(async () => { | ||
| if (window?.psaccountsVue) { | ||
| return window?.psaccountsVue?.init(); | ||
| } | ||
| const accountFallback = (await import("prestashop_accounts_vue_components")).default; | ||
| accountFallback.init(); | ||
| }); | ||
| </script> | ||
| <style lang="scss"> | ||
| #settingsApp { | ||
| font-family: Open Sans, Helvetica, Arial, sans-serif; | ||
| } | ||
| .nobootstrap { | ||
| background-color: unset !important; | ||
| padding: 100px 10px 100px; | ||
| min-width: unset !important; | ||
| } | ||
| .page-sidebar.mobile #content.nobootstrap { | ||
| @apply psacc-ml-0; | ||
| } | ||
| .onboarding { | ||
| @apply psacc-pt-24 psacc-max-w-screen-lg psacc-mx-auto; | ||
| &-header { | ||
| @apply psacc-mb-2; | ||
| } | ||
| @screen md { | ||
| @apply psacc-pt-4; | ||
| &-header { | ||
| @apply psacc-mb-4; | ||
| } | ||
| } | ||
| } | ||
| </style> |
4 changes: 1 addition & 3 deletions
4
_dev/src/core/app/assets/index.css → _dev/src/assets/index.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| @tailwind base; | ||
|
|
||
| @tailwind components; | ||
|
|
||
| @tailwind utilities; | ||
| @tailwind utilities; |
Oops, something went wrong.