Merge pull request #35 from ungdev/pnpm

fix: from yarn to pnpm

.dockerignore

@@ -3,7 +3,7 @@
 
 # production
 /build
-yarn-error.log
+pnpm-error.log
 
 # misc
 .DS_Store

.env.example

@@ -1,16 +1,16 @@
-# React dotenv
-
-NODE_ENV=development
-PORT=8081
-
-# Pour désactiver l'ouverture dans un nouvel onglet
-BROWSER=none
-
-
-# App dotenv. These variables are used DURING react build.
-# For this reason, the values below will only be used with
-# `yarn dev`. For values used along with `yarn build`, check
-# the Dockerfile (docker build arguments)
-
-REACT_APP_API_URI=http://localhost:3001
+# React dotenv
+
+NODE_ENV=development
+PORT=8081
+
+# Pour désactiver l'ouverture dans un nouvel onglet
+BROWSER=none
+
+
+# App dotenv. These variables are used DURING react build.
+# For this reason, the values below will only be used with
+# `pnpm dev`. For values used along with `pnpm build`, check
+# the Dockerfile (docker build arguments)
+
+REACT_APP_API_URI=http://localhost:3001
 REACT_APP_API_TIMEOUT=5000

.github/workflows/ci.yml

@@ -4,22 +4,36 @@ on: [push, pull_request]
 jobs:
   lint:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn --frozen-lockfile
-      - run: yarn lint
+          version: 8
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm lint
 
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn --frozen-lockfile
-      - run: yarn build
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm build

.gitignore

@@ -1,27 +1,30 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# CRA Typescript file generated
-src/*.d.ts
-
-TODO.txt
-bouffe-captures/
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env
+
+# debug
+npm-debug.log*
+pnpm-debug.log*
+pnpm-error.log*
+
+# CRA Typescript file generated
+src/*.d.ts
+
+TODO.txt
+bouffe-captures/
+
+# IDE
+.idea/

Dockerfile

@@ -10,21 +10,23 @@ ENV REACT_APP_API_TIMEOUT $API_TIMEOUT
 
 WORKDIR /srv/app
 
+RUN npm install -g pnpm
+
 RUN chown node:node .
 
 USER node
 
 # Node has the uid 1000
-COPY --chown=node:node package.json yarn.lock ./
+COPY --chown=node:node package.json pnpm-lock.yaml ./
 
-RUN yarn --frozen-lockfile --production=false
+RUN pnpm install --frozen-lockfile
 
 COPY --chown=node:node ./ ./
 
 # Build api
-RUN yarn build
+RUN pnpm build
 
 # Prunes devDependencies
-RUN yarn install --production --ignore-scripts --prefer-offline
+RUN pnpm install --production --ignore-scripts --prefer-offline
 
-CMD yarn start
+CMD pnpm start

README.md

@@ -1,37 +1,37 @@
-# UA Bouffe API
-[![Build Status](https://travis-ci.org/ungdev/UA-bouffe.svg?branch=master)](https://travis-ci.org/ungdev/UA-bouffe)
-
-Console de vente de l'UTT Arena
-
-## Installation
-
-### Prérequis
-
-- NodeJS
-- Yarn
-
-### Installation de l'application
-```
-git clone https://github.com/ungdev/UA-bouffe
-cp .env.example .env
-yarn
-```
-## Développement
-
-### Démarrer l'API en développement
-```
-yarn dev
-```
-### Avant de commit
-Afin de garder une certaine cohérence dans le code, on utilise EsLint et Prettier. Il faut donc bien lint le code avant de commit
-```
-yarn lint-fix
-```
-
-### Démarrer l'API en production
-```
-yarn build
-yarn start
-```
-### Licence
-Le code est sous licence MIT.
+# UA Bouffe API
+[![Build Status](https://travis-ci.org/ungdev/UA-bouffe.svg?branch=master)](https://travis-ci.org/ungdev/UA-bouffe)
+
+Console de vente de l'UTT Arena
+
+## Installation
+
+### Prérequis
+
+- NodeJS
+- Pnpm
+
+### Installation de l'application
+```
+git clone https://github.com/ungdev/UA-bouffe
+cp .env.example .env
+pnpm
+```
+## Développement
+
+### Démarrer l'API en développement
+```
+pnpm dev
+```
+### Avant de commit
+Afin de garder une certaine cohérence dans le code, on utilise EsLint et Prettier. Il faut donc bien lint le code avant de commit
+```
+pnpm lint-fix
+```
+
+### Démarrer l'API en production
+```
+pnpm build
+pnpm start
+```
+### Licence
+Le code est sous licence MIT.

package.json

@@ -31,6 +31,7 @@
     "socket.io-client": "^4.3.2"
   },
   "devDependencies": {
+    "@types/history": "^4.7.11",
     "@types/node": "^16.11.64",
     "@types/react": "^17.0.50",
     "@types/react-dom": "^17.0.17",