Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
ec35bfe
Create main.yml
horotopia Dec 9, 2024
124a4e6
feat(lock): add package-lock.json
horotopia Dec 9, 2024
656ffd7
feat(gh-action): change main.yml
horotopia Dec 9, 2024
55a8c4d
feat(gh-action): change main.yml
horotopia Dec 9, 2024
9d1c56b
feat(gh-action): change main.yml
horotopia Dec 9, 2024
e0506f5
Update main.yml
LeGrizzly Dec 9, 2024
53985ef
feat(gh-action): change main.yml
horotopia Dec 9, 2024
f81931c
feat(gh-action): change main.yml
horotopia Dec 9, 2024
0d8c26d
feat(gh-action): change main.yml
horotopia Dec 9, 2024
0bb2849
feat(gh-action): change main.yml
horotopia Dec 9, 2024
297e7fc
feat(gh-action): change main.yml
horotopia Dec 9, 2024
95f4187
feat(gh-action): change main.yml
horotopia Dec 9, 2024
dc45682
fix(upload): create temporary directory
LeGrizzly Jan 4, 2025
07331c5
Fix Admin Dashboard
ArthurSerenne Jan 4, 2025
a54812d
feat(clients): new form and add media upload functionality
LeGrizzly Jan 4, 2025
5354dd9
Merge branch 'feat/dashboard/clients' of https://github.com/horotopia…
LeGrizzly Jan 4, 2025
f7729c0
Merge branch 'beta' into feat/dashboard/clients
LeGrizzly Jan 4, 2025
cbc4ebd
Merge branch 'fix/compoments/upload' into feat/dashboard/clients
LeGrizzly Jan 5, 2025
a729db1
Merge pull request #86 from horotopia/feat/dashboard/clients
LeGrizzly Jan 5, 2025
fe68897
fix(clients): remove picture URL display in admin clients page
LeGrizzly Jan 5, 2025
cf8f254
Création des order avec le panier et le paiement
ArthurSerenne Jan 5, 2025
55c9312
Update de l'incrémentation des produits
ArthurSerenne Jan 5, 2025
5e0e6c8
Sécurisation et feature du panier
ArthurSerenne Jan 5, 2025
e9235f3
feat(products): add endpoint to count products sold in the current an…
LeGrizzly Jan 5, 2025
da6ca40
Fix du register nom et prénom
ArthurSerenne Jan 5, 2025
4ed22d4
Merge remote-tracking branch 'origin/feat/dashboard/widget' into feat…
ArthurSerenne Jan 5, 2025
aad5e4f
Donnée Analytics product
ArthurSerenne Jan 5, 2025
2d8a5f2
Ajout de la feature profile
ArthurSerenne Jan 5, 2025
9fcd79c
Route pour les commandes User
ArthurSerenne Jan 5, 2025
cefc88a
Création du register
ArthurSerenne Jan 5, 2025
9098209
Ajout, Update de l'adresse User
ArthurSerenne Jan 5, 2025
8ab6c42
Autocompletion des addresses pour la facturation
ArthurSerenne Jan 6, 2025
ee13a62
Règles de redirections du Panier
ArthurSerenne Jan 6, 2025
406b7ed
DatastatOne à finir
ArthurSerenne Jan 6, 2025
5d2d13e
Recup des datastat
ArthurSerenne Jan 6, 2025
cdece57
Fixtures + Datatstat dynamique
ArthurSerenne Jan 6, 2025
9a952c7
Datatstat session
ArthurSerenne Jan 6, 2025
44abde3
Fixtures products
ArthurSerenne Jan 6, 2025
c0d6514
Gestion lien confirmation d'inscription, envoie mail confirmation et …
EEEEEEKRAN Jan 6, 2025
734e987
feat(api): add some swagger and a new endpoint
horotopia Jan 6, 2025
27a0b35
Pages pokemon & accessoire
ArthurSerenne Jan 6, 2025
2c99c46
Merge branch 'feat/dashboard/widget' into beta
horotopia Jan 6, 2025
90b47b9
feat(table): add CSV export functionality
LeGrizzly Jan 6, 2025
43e6072
fix(clients): update CSV export settings for action and pictures fields
LeGrizzly Jan 6, 2025
ad48d26
refactor(orders): enhance order editing functionality and update data…
LeGrizzly Jan 6, 2025
290561b
Merge pull request #87 from horotopia/feat/dashboard/clients
LeGrizzly Jan 6, 2025
f6cfedf
Merge branch 'datastat-dev' into beta
ArthurSerenne Jan 6, 2025
5d9952d
Fixtures au complet
ArthurSerenne Jan 6, 2025
4c8bc40
refactor(client): migrate from main.ts to main.js and enhance app ini…
LeGrizzly Jan 6, 2025
3806c35
Implémentation du système de réinitialisation de mot de passe avec en…
EEEEEEKRAN Jan 6, 2025
7a39b41
fix(api): correction des modèles Mongoose (éviter la recompilation) e…
EEEEEEKRAN Jan 6, 2025
b316d8e
Description card
ArthurSerenne Jan 6, 2025
2b62fb0
Ajout de l'exemption de vérification d'email pour les administrateurs…
EEEEEEKRAN Jan 6, 2025
ac7ca6d
Chart view
ArthurSerenne Jan 6, 2025
f915c97
Merge branch 'Dev-Erkant' into beta
EEEEEEKRAN Jan 6, 2025
bf0607e
Merge branch 'feat-features' into beta
ArthurSerenne Jan 6, 2025
e06d78c
fix du login utilisateur parceque je l'avais cassé lol
EEEEEEKRAN Jan 6, 2025
62abd09
Merge branch 'Dev-Erkant' into beta
EEEEEEKRAN Jan 6, 2025
a742f67
petite simplification de code de rien du tout sur Pokemon.vue
EEEEEEKRAN Jan 6, 2025
a6e57a8
Merge branch 'beta' of https://github.com/horotopia/MEVN into Dev-Erkant
EEEEEEKRAN Jan 6, 2025
dc9a581
Fix Pokemon filter page
ArthurSerenne Jan 6, 2025
4155316
feat(dashboard): connect Back to chartOne
horotopia Jan 6, 2025
98b086c
Merge remote-tracking branch 'origin/dashboard/charts/totalAmountByMo…
ArthurSerenne Jan 6, 2025
7abb832
Tri des produits par catégorie et amélioration de la gestion du panie…
EEEEEEKRAN Jan 6, 2025
7725f82
Responsive fix
ArthurSerenne Jan 7, 2025
f689b08
Responsivité Mobile sur les pages Pokémon, Pokemon Details, Accessoir…
EEEEEEKRAN Jan 7, 2025
d1cc0a5
Merge remote-tracking branch 'origin/Dev-Erkant' into feat-last-minutes
ArthurSerenne Jan 7, 2025
2621aed
Responsive Contact
ArthurSerenne Jan 7, 2025
41dad08
Enhance product management by adding 'habitat' and 'habitude' fields …
LeGrizzly Jan 7, 2025
b7e33ca
Refactor API and client configuration for improved deployment and rem…
LeGrizzly Jan 7, 2025
dc93c11
Add CORS configuration to support dynamic origins from environment va…
LeGrizzly Jan 7, 2025
da92ab1
Refactor API URLs to use environment variable for dynamic configuration
LeGrizzly Jan 7, 2025
12c0a7b
Update docker-compose to set development as default build target for …
LeGrizzly Jan 7, 2025
8e5dd93
Remove console log statements for cleaner code
LeGrizzly Jan 7, 2025
d2db9e4
je sais plus franchement, mais les fixtures ça je sais
EEEEEEKRAN Jan 7, 2025
d5abdb9
Enhance CORS configuration to support dynamic origin validation from …
LeGrizzly Jan 7, 2025
7f2bb1c
Add export functionality to Table component and improve search input …
LeGrizzly Jan 7, 2025
f76425b
Refonte de la HomePage + fix de Pokémon Details
EEEEEEKRAN Jan 7, 2025
c39ded2
Refactor API URLs to use environment variable for dynamic configurati…
LeGrizzly Jan 7, 2025
7fe53e2
Merge branch 'Dev-Erkant' into beta
EEEEEEKRAN Jan 7, 2025
737fd4e
Fix media name generation in Products.vue to use productId instead of…
LeGrizzly Jan 7, 2025
367e76a
Fix des features
ArthurSerenne Jan 7, 2025
05a10ef
Fix restet mail
ArthurSerenne Jan 7, 2025
7e8d2a6
chart modif
ArthurSerenne Jan 7, 2025
95729a0
Fix de la carousel de Home
EEEEEEKRAN Jan 7, 2025
b5d1caf
Merge branch 'Dev-Erkant' into beta
EEEEEEKRAN Jan 7, 2025
2bc00f6
fix(dashboard): fix some bugs
horotopia Jan 7, 2025
1cf5661
Update PokemonDetails.vue to display images
ArthurSerenne Jan 7, 2025
a7a884c
feat(commande): add details commande user
LeGrizzly Jan 7, 2025
5d18c79
feat(form): conditionally render submit button based on text object
LeGrizzly Jan 7, 2025
c1d01c6
fix(dashboard): fix some bugs on cards for stats
horotopia Jan 7, 2025
3aa41e3
Merge branch 'beta' of https://github.com/horotopia/MEVN into beta
horotopia Jan 7, 2025
4ca4ba2
fix rôle USER
ArthurSerenne Jan 7, 2025
251aed1
Front Paiement Strip
EEEEEEKRAN Jan 7, 2025
dba8b20
Merge branch 'Dev-Erkant' into beta
EEEEEEKRAN Jan 7, 2025
d66053d
Merge branch 'beta' of https://github.com/horotopia/MEVN into beta
EEEEEEKRAN Jan 7, 2025
a9b8397
Refactor CardPokémon component to use a single item prop and simplify…
LeGrizzly Jan 7, 2025
fb47e5b
Merge branch 'feat/card/pictures' into beta
LeGrizzly Jan 7, 2025
3c23e57
image panier
ArthurSerenne Jan 7, 2025
d2ab6e5
Merge branch 'beta' of https://github.com/horotopia/MEVN into beta
ArthurSerenne Jan 7, 2025
be535b0
Merge branch 'beta' of https://github.com/horotopia/MEVN into beta
horotopia Jan 7, 2025
39b3931
Remove unused imports in Form.vue
LeGrizzly Jan 7, 2025
614f1de
feat(Panier): add product picture
LeGrizzly Jan 7, 2025
240333d
fix(pokeball file): remove a file that don't used
horotopia Jan 7, 2025
58e91fc
fix(index): remove pokeball from index
horotopia Jan 7, 2025
1a5c965
fix(typescript): remove typescript from Frontend
horotopia Jan 7, 2025
061125e
fix(typescript): on continue de débroussailler
horotopia Jan 7, 2025
8ea9694
Merge remote-tracking branch 'origin/beta' into CI
horotopia Jan 8, 2025
657f0c2
fix(lock): remove package-lock.json
horotopia Jan 8, 2025
270febd
fix: update dependencies for improved performance
horotopia Jan 8, 2025
024b70e
feat(test): add tests for auth controller
horotopia Jan 8, 2025
8fe78b3
Super test sur les controller User, order et products
EEEEEEKRAN Jan 8, 2025
4afc969
fix de l'order test
ArthurSerenne Jan 8, 2025
b19c395
ConsoleLog error
ArthurSerenne Jan 8, 2025
e56fbe8
feat(test): unit tests for user creation
LeGrizzly Jan 8, 2025
9c16828
feat(models): add Pictures model with schema definition
LeGrizzly Jan 8, 2025
7ca8868
on na pas le temps
horotopia Jan 8, 2025
a07a264
fix: resolve merge conflicts in Pictures model and user tests
horotopia Jan 8, 2025
946ea09
Merge branch 'ErkantTest' into CI
ArthurSerenne Jan 8, 2025
88b55f8
last commit for me
horotopia Jan 8, 2025
1bafee4
Merge branch 'CI' of https://github.com/horotopia/MEVN into CI
horotopia Jan 8, 2025
8150030
feat: add user service tests for finding and updating users
LeGrizzly Jan 8, 2025
737f2ae
refactor: update jest config and clean up error logging in user and p…
LeGrizzly Jan 8, 2025
0d21b30
test: enhance session service tests with additional cases and improve…
LeGrizzly Jan 8, 2025
d02dda7
feat: add setup file for test environment and update jest config to i…
LeGrizzly Jan 8, 2025
a5b60d2
fix(test): address tests to unit tests
LeGrizzly Jan 9, 2025
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
40 changes: 40 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI

on: [push]

jobs:
build:
name: node_build_job
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- name: Checkout repository
uses: actions/checkout@v4 # Récupère le code de votre repo

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Move & Install API dependencies
run: cd api && npm ci # Installe les dépendances du projet

- name: Build
run: cd api && npm run build --if-present

- name: Run tests
run: cd api && npm run test --if-present # Commande pour lancer vos tests Vitest, modifiez selon votre script de test

- name: Move & Install Client dependencies
run: cd client && npm ci # Installe les dépendances du projet

- name: Build
run: cd client && npm run build --if-present
4 changes: 4 additions & 0 deletions api/.env.exemple
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ MONGO_DB=ecommerce

MONGO_URI=mongodb://${MONGO_HOST}:${MONGO_PORT}/${MONGO_DB}

FRONTEND_URL=https://pokeshop.mom

SECRET_KEY=
JWT_SECRET=
EMAIL_HOST=
Expand All @@ -16,3 +18,5 @@ EMAIL_PASS= # Your email password
STRIPE_SECRET_KEY= # Your stripe secret key
PAYPAL_CLIENT_ID= # Your paypal client id
PAYPAL_CLIENT_SECRET= # Your paypal client secret

CORS_ORIGIN=[]
2 changes: 1 addition & 1 deletion api/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN yarn build
# production stage
FROM nginx:1.27.1-alpine3.20 AS production

# COPY ./nginx.conf /etc/nginx/nginx.conf
COPY ./nginx.conf /etc/nginx/nginx.conf
COPY --from=build /api/dist /opt/app

EXPOSE 80
Expand Down
20 changes: 20 additions & 0 deletions api/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/** @type {import('ts-jest').JestConfigWithTsJest} **/
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
roots: ['<rootDir>/src'],
testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
transform: {
'^.+\\.ts$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'js', 'json', 'node'],
collectCoverage: true,
coverageDirectory: 'coverage',
coveragePathIgnorePatterns: [
'/node_modules/',
'/dist/'
],
verbose: true,
modulePathIgnorePatterns: ['<rootDir>/src/tests/__WIP'],
setupFiles: ['<rootDir>/src/tests/setup.js'],
};
2 changes: 1 addition & 1 deletion api/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ events {

http {
server {
listen 8082;
listen 80;
server_name _;

root /opt/app;
Expand Down
Loading
Loading