Skip to content

Commit

Permalink
Merge pull request #132 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Merge `develop` into `master`
  • Loading branch information
boubkerbribri authored Dec 22, 2023
2 parents 07f3b80 + b535803 commit c4b67e4
Show file tree
Hide file tree
Showing 19 changed files with 22,280 additions and 14,316 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/cd-prestabulle-clean.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: QANIGHTLY PRESTABULLE CLEANING

on:
pull_request:
types: [closed]
branches:
- develop

env:
LABELS: ${{toJSON(github.event.pull_request.labels)}}

jobs:
qanightly_prestabulle:
name: apiqanightly Cleaning Prestabulle
runs-on: ubuntu-latest
timeout-minutes: 25
if: contains(github.event.pull_request.labels.*.name, 'prestabulle1') ||
contains(github.event.pull_request.labels.*.name, 'prestabulle2') ||
contains(github.event.pull_request.labels.*.name, 'prestabulle3')

steps:

- name: Checkout the repository 🎁
uses: actions/checkout@v3

- name: Setting up the Bulle variable for later 💬
run: echo "BULLE=$BULLE$(echo $LABELS > labels.json && cat labels.json | jq -r '.[]|.name'|grep prestabulle)" >> $GITHUB_OUTPUT
id: get_bulle

- name: Trigger clean prestabulle
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: prestabulle-clean.yml
repo: PrestaShopCorp/qanightlyresults-cd
inputs: '{ "project": "nightly", "bulle": "${{ steps.get_bulle.outputs.BULLE }}"}'
token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
ref: 'refs/heads/main'
30 changes: 30 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Check Build

on:
pull_request:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout 🛎
uses: actions/checkout@v3

- name: Setup node env 🏗
uses: actions/setup-node@v3
with:
node-version: 14.21
cache: 'npm'

- name: Install dependencies 💚
run: npm install

- name: Build project
run: npm run build

- name: Generate project
run: npm run generate
38 changes: 38 additions & 0 deletions .github/workflows/integration-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Integration CD for QAnightly

on:
pull_request:
types: [opened, reopened, synchronize, labeled]

env:
LABELS: ${{toJSON(github.event.pull_request.labels)}}

jobs:
integration_deployment:
name: Deploy (integration)
runs-on: ubuntu-latest
environment: integration
if: contains(github.event.pull_request.labels.*.name, 'prestabulle1') ||
contains(github.event.pull_request.labels.*.name, 'prestabulle2') ||
contains(github.event.pull_request.labels.*.name, 'prestabulle3')

steps:
- name: Checkout the repository 🎁
uses: actions/checkout@v3

- name: Setting up the Bulle variable for later 💬
run: echo "BULLE=$BULLE$(echo $LABELS > labels.json && cat labels.json | jq -r '.[]|.name'|grep prestabulle)" >> $GITHUB_OUTPUT
id: get_bulle

- name: Get branch name
id: branch
uses: tj-actions/[email protected]

- name: Trigger CI / CD
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: integration-cd.yml
repo: PrestaShopCorp/qanightlyresults-cd
inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
ref: 'refs/heads/main'
26 changes: 26 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Lint

on:
pull_request:
push:
branches:
- develop

jobs:
eslint:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 14.21
cache: 'npm'

- name: Install dependencies 💚
run: npm install

- name: Lint
run: npm run lint
30 changes: 30 additions & 0 deletions .github/workflows/preproduction-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: preprod CD for QAnightly

on:
push:
branches:
- develop

jobs:
preprod_deployment:
name: Deploy (preprod)
runs-on: ubuntu-latest
environment: preproduction
concurrency: preprod-cd

steps:
- name: Checkout the repository 🎁
uses: actions/checkout@v3

- name: Get branch name
id: branch
uses: tj-actions/[email protected]

- name: Trigger CI / CD
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: preproduction-cd.yml
repo: PrestaShopCorp/qanightlyresults-cd
inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
ref: 'refs/heads/main'
29 changes: 29 additions & 0 deletions .github/workflows/production-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: production CD for QAnightly

on:
release:
types: [released]

jobs:
production_deployment:
name: Deploy (production)
runs-on: ubuntu-latest
environment: production
concurrency: production-cd

steps:
- name: Checkout the repository 🎁
uses: actions/checkout@v3

- name: Get branch name
id: branch
uses: tj-actions/[email protected]

- name: Trigger CI / CD
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: production-cd.yml
repo: PrestaShopCorp/qanightlyresults-cd
inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
ref: 'refs/heads/main'
26 changes: 26 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Test

on:
pull_request:
push:
branches:
- develop

jobs:
jest:
name: Jest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 14.21
cache: 'npm'

- name: Install dependencies 💚
run: npm install

- name: Lint
run: npm run test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.7
FROM node:14.21

RUN mkdir -p /app
EXPOSE 3000
Expand Down
1 change: 1 addition & 0 deletions assets/scss/config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $white: #fff;
$skipped: #442ac6;
$skippedBg: #dad5f4;
$lowgray: #b3c7cd;
$bg-header: #A4DBE8;

// Dark mode
$backgroundDark: #1c1c24;
Expand Down
14 changes: 11 additions & 3 deletions components/reusable/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,30 @@
position: fixed;
top: 0;
width: 100%;
background: $primary;
background: $bg-header;
box-shadow: 0 0 10px 0 rgba(black, 0.2);
z-index: 10;
min-height: 50px;
transition: 0.4s ease-out;
@at-root .dark & {
background: $primaryDark;
h1 {
color: white;
}
.dates > p {
color: white;
}
}
&.isMobile {
padding: 0 15px;
}
h1 {
color: white;
color: #000;
font-size: 20px;
font-weight: bold;
width: 100%;
Expand All @@ -105,7 +113,7 @@
> p {
font-size: 16px;
line-height: 22px;
color: white;
color: #000;
margin-bottom: 0;
&:first-child {
Expand Down
Loading

0 comments on commit c4b67e4

Please sign in to comment.