Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #132

Merged
merged 118 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
19306d7
CI : Added workflow for check the build is OK
Progi1984 Feb 15, 2023
08a2e7f
CI : Added workflow for check lint
Progi1984 Feb 15, 2023
6a18fd9
CI : Added workflow for check tests
Progi1984 Feb 15, 2023
e6d428e
CI : Use cache from actions/setup-node
Progi1984 Feb 15, 2023
eec0265
Add line in end of file
boubkerbribri Feb 15, 2023
70d6c61
Merge pull request #110 from Progi1984/ci
Progi1984 Feb 15, 2023
12ccfca
CI : Fixed Nuxt Tests
Progi1984 Feb 15, 2023
0ccc2ea
Merge pull request #111 from Progi1984/fixCI
Progi1984 Feb 15, 2023
5c6efd0
Bump express from 4.17.1 to 4.18.2
dependabot[bot] Feb 15, 2023
0b71e29
Bump decode-uri-component from 0.2.0 to 0.2.2
dependabot[bot] Feb 15, 2023
9c07c97
Bump ansi-html and webpack-hot-middleware
dependabot[bot] Feb 15, 2023
c21e045
Merge pull request #102 from PrestaShop/dependabot/npm_and_yarn/expre…
Progi1984 Feb 15, 2023
e56c495
Merge pull request #100 from PrestaShop/dependabot/npm_and_yarn/decod…
Progi1984 Feb 15, 2023
d324ed6
Bump got and nodemon
dependabot[bot] Feb 15, 2023
45700e9
Merge pull request #94 from PrestaShop/dependabot/npm_and_yarn/ansi-h…
Progi1984 Feb 15, 2023
b1ab31e
Merge pull request #96 from PrestaShop/dependabot/npm_and_yarn/got-an…
Progi1984 Feb 15, 2023
03e4601
Bump ua-parser-js from 0.7.31 to 0.7.33
dependabot[bot] Feb 15, 2023
5ac60fd
Bump jsdom and jest
dependabot[bot] Feb 15, 2023
fe022b5
Merge pull request #105 from PrestaShop/dependabot/npm_and_yarn/ua-pa…
Progi1984 Feb 15, 2023
a1bb3e7
Bump node version to v14
Progi1984 Feb 15, 2023
dda56da
Fixed CI
Progi1984 Feb 15, 2023
67c7bc1
Merge pull request #99 from PrestaShop/dependabot/npm_and_yarn/jsdom-…
Progi1984 Feb 15, 2023
1d8f6b2
Bump scss-tokenizer and node-sass
dependabot[bot] Feb 15, 2023
14308fe
Removed node-sass & Added sass
Progi1984 Feb 15, 2023
88b9097
Merge pull request #95 from PrestaShop/dependabot/npm_and_yarn/scss-t…
Progi1984 Feb 15, 2023
f299cab
Bump is-svg and postcss-svgo
dependabot[bot] Feb 15, 2023
25a207a
Merge pull request #112 from PrestaShop/dependabot/npm_and_yarn/is-sv…
Progi1984 Feb 15, 2023
a5e46ce
Bump nth-check and nuxt
dependabot[bot] Feb 15, 2023
7272d5b
Bump vue to 2.7 and css-loader to 5.2
Progi1984 Feb 15, 2023
a836ed2
Merge pull request #113 from PrestaShop/dependabot/npm_and_yarn/nth-c…
Progi1984 Feb 15, 2023
4acab43
Bump ini from 1.3.5 to 1.3.8
dependabot[bot] Feb 15, 2023
39d840d
Bump acorn from 6.4.0 to 6.4.2
dependabot[bot] Feb 15, 2023
95ced2c
Bump loader-utils from 1.2.3 to 1.4.2
dependabot[bot] Feb 15, 2023
e95f667
Bump ansi-regex
dependabot[bot] Feb 15, 2023
b6e5cc9
Merge pull request #115 from PrestaShop/dependabot/npm_and_yarn/acorn…
Progi1984 Feb 15, 2023
5be29fc
Merge pull request #116 from PrestaShop/dependabot/npm_and_yarn/loade…
Progi1984 Feb 15, 2023
f53df54
Merge pull request #114 from PrestaShop/dependabot/npm_and_yarn/ini-1…
Progi1984 Feb 15, 2023
bd6b556
Merge pull request #117 from PrestaShop/dependabot/npm_and_yarn/ansi-…
Progi1984 Feb 15, 2023
4ec96a6
ci: Draft of preprod cd migration from jenkins to gihub action, add c…
Feb 20, 2023
78385b6
ci: Draft of action needed on cd migration from jenkins to github action
elodie-bil3 Feb 20, 2023
4d3b1e1
ci: Update mistake made on naming file and variable, prepare for GCP …
elodie-bil3 Feb 21, 2023
17a26a4
ci: Remove useless commentary + uncomment auth-gcp of my cd
elodie-bil3 Feb 22, 2023
6f50977
ci: Line 24 error, too much indent
elodie-bil3 Feb 22, 2023
fe7c17d
ci: Line 21 error, not enought indent :D
elodie-bil3 Feb 22, 2023
b89b983
ci: Error on arborescence of .github folder
elodie-bil3 Feb 22, 2023
a843989
ci: Error on naming for integration
elodie-bil3 Feb 22, 2023
ece7b7a
ci: Error on variable usage
elodie-bil3 Feb 22, 2023
1f8ab87
ci: Auth-gcp working, tested
elodie-bil3 Feb 22, 2023
49ea5df
ci: Testing build and deploy in registry
elodie-bil3 Feb 22, 2023
6de0fc6
ci: Testing build and deploy with auth-gcp action
elodie-bil3 Feb 22, 2023
d5cb496
ci: Validate build and push on registry
elodie-bil3 Feb 22, 2023
652e2d6
ci: Cleaning pull requests after validation of test
elodie-bil3 Feb 22, 2023
b19a8b4
ci: add deploy action
elodie-bil3 Feb 22, 2023
f601327
ci: Testing with tags in registry
elodie-bil3 Feb 23, 2023
613379d
ci: Testing to deploy with terraform
elodie-bil3 Feb 23, 2023
196fee2
ci: Testing to deploy with terraform
elodie-bil3 Feb 23, 2023
b3347d8
ci: Add git configuration to clone repository
elodie-bil3 Feb 23, 2023
88d5eee
ci: Error indent
elodie-bil3 Feb 23, 2023
7c51341
ci: Error forget quote
elodie-bil3 Feb 23, 2023
4b4395e
ci: Error
elodie-bil3 Feb 23, 2023
e1fe3b2
ci: Error on labels values
elodie-bil3 Feb 23, 2023
1ed92e1
ci: Launch reel deployement on gke
elodie-bil3 Feb 23, 2023
a8663ea
ci: Clear
elodie-bil3 Feb 23, 2023
b4e79d8
feat: refacto cd
elodie-bil3 Mar 6, 2023
5682e76
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
696187e
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
898076c
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
8db2a4c
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
e482b82
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
4c90d6c
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
0cdaa1a
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
db115db
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
cc6a4fb
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
db54b52
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
a1a1274
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
c4f188d
feat: Debug ci cd
elodie-bil3 Mar 7, 2023
7fbf94f
feat: error in name
elodie-bil3 Mar 7, 2023
ffe4076
feat: validate ci cd
elodie-bil3 Mar 7, 2023
dae0294
feat: prestabulle workflow annd preprod worflow
elodie-bil3 Mar 8, 2023
506cfe3
feat: make the front work
elodie-bil3 Mar 13, 2023
541142b
feat: make the prestabulle cleaning work
elodie-bil3 Mar 13, 2023
2ec289f
feat: preprod
elodie-bil3 Mar 16, 2023
7faa7da
feat: preprod
elodie-bil3 Mar 16, 2023
b4278e7
feat: add production ressoruces
elodie-bil3 Mar 17, 2023
85f3ef8
feat: suppress useless stuff
elodie-bil3 Mar 17, 2023
03359e8
Nuxt Endpoint : /healthcheck
Progi1984 Mar 30, 2023
62644e2
Merge pull request #120 from Progi1984/healthcheck
boubkerbribri Mar 30, 2023
09d8c2c
Merge remote-tracking branch 'origin' into ops/ci-cd-rework
elodie-bil3 Mar 31, 2023
0458eba
Feat: protect variable bucket
elodie-bil3 Apr 12, 2023
0035687
Merge pull request #119 from PrestaShop/ops/ci-cd-rework
elodie-bil3 Apr 12, 2023
a97315e
feat: rework workflow
elodie-bil3 Jul 6, 2023
2eadbc1
feat: rework workflow
elodie-bil3 Jul 6, 2023
52fb2da
fix: workflow branch dispatch
elodie-bil3 Jul 6, 2023
9a824e2
build(deps): bump tough-cookie from 4.1.2 to 4.1.3
dependabot[bot] Jul 10, 2023
0fe71bb
Merge pull request #123 from PrestaShop/dependabot/npm_and_yarn/tough…
mflasquin Jul 10, 2023
34200cc
feat: error in integration workflow
elodie-bil3 Jul 10, 2023
0190ca2
feat: error in integration workflow
elodie-bil3 Jul 10, 2023
a61e5b2
build(deps): bump semver from 5.7.1 to 5.7.2
dependabot[bot] Jul 11, 2023
06c4b7b
Merge pull request #124 from PrestaShop/dependabot/npm_and_yarn/semve…
mflasquin Jul 11, 2023
c1f7519
fix: workflow + try
elodie-bil3 Jul 12, 2023
65f2fbf
fix: workflow + try
elodie-bil3 Jul 12, 2023
8e7508b
fix: workflow + try
elodie-bil3 Jul 12, 2023
d1d6fc5
fix: workflow
elodie-bil3 Jul 12, 2023
38d4256
fix: ref on integration
elodie-bil3 Jul 13, 2023
48ddf4d
fix: ref on integration
elodie-bil3 Jul 13, 2023
6dfebeb
Merge pull request #122 from PrestaShop/feat/migration-nightly-upgrade
elodie-bil3 Jul 13, 2023
0665f9c
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4
dependabot[bot] Jul 19, 2023
5589177
Merge pull request #125 from PrestaShop/dependabot/npm_and_yarn/word-…
nicosomb Jul 19, 2023
22d229b
Feat: upgrade
elodie-bil3 Sep 5, 2023
8c7229e
Merge pull request #126 from PrestaShop/feat/migration-nightly-upgrade
elodie-bil3 Sep 5, 2023
8717273
build(deps): bump @babel/traverse and babel-eslint
dependabot[bot] Oct 16, 2023
efd5855
Merge pull request #128 from PrestaShop/dependabot/npm_and_yarn/babel…
boubkerbribri Oct 19, 2023
acb4b82
build(deps): bump browserify-sign from 4.2.1 to 4.2.2
dependabot[bot] Oct 28, 2023
f0c4866
Merge pull request #129 from PrestaShop/dependabot/npm_and_yarn/brows…
Progi1984 Oct 28, 2023
3dde740
build(deps): bump tj-actions/branch-names in /.github/workflows
dependabot[bot] Dec 5, 2023
46e56b9
Merge pull request #130 from PrestaShop/dependabot/github_actions/dot…
Progi1984 Dec 19, 2023
6a804df
Adapt to the new branding
boherm Dec 21, 2023
b535803
Merge pull request #131 from boherm/rebranding-2024
matks Dec 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading