Merge pull request #37 from ungdev/up_dep

Upgrade dependencies and migrate to Nextjs

.editorconfig

@@ -1,13 +1,13 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Windows-style newlines
-[*]
-end_of_line = lf
-insert_final_newline = false
-charset = utf-8
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace=true
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+# Unix-style newlines
+end_of_line = lf
+insert_final_newline = false
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

.env.example

@@ -1,16 +1,14 @@
 # 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.
+# Page dotenv. These variables are used DURING next 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
+NEXT_PUBLIC_API_URI=http://localhost:3001
+NEXT_PUBLIC_API_TIMEOUT=5000

.eslintrc.json

@@ -1,15 +1,19 @@
 {
   "parser": "@typescript-eslint/parser",
   "extends": [
-    "react-app",
+    "next/core-web-vitals",
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:import/errors",
     "plugin:import/warnings",
     "plugin:import/typescript",
     "prettier"
   ],
-  "plugins": ["@typescript-eslint", "react-hooks", "prettier"],
+  "plugins": [
+    "@typescript-eslint",
+    "react-hooks",
+    "prettier"
+  ],
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
@@ -23,8 +27,11 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "no-console": "error",
     "no-alert": "error",
-    "linebreak-style": ["warn", "unix"],
-    "react/require-default-props": "error",
+    "linebreak-style": [
+      "warn",
+      "unix"
+    ],
+    "react/require-default-props": "off",
     "react-hooks/rules-of-hooks": "error",
     "react-hooks/exhaustive-deps": "warn",
     "react/no-unescaped-entities": "off",

.github/workflows/ci.yml

@@ -1,19 +1,19 @@
 name: CI
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [ 20 ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v2
         with:
           version: 8
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -24,14 +24,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [ 20 ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v2
         with:
           version: 8
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.gitignore

@@ -13,6 +13,9 @@
 
 # misc
 .DS_Store
+
+# local env files
+.env*.local
 .env
 
 # debug
@@ -23,8 +26,17 @@ pnpm-error.log*
 # CRA Typescript file generated
 src/*.d.ts
 
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
 TODO.txt
 bouffe-captures/
 
 # IDE
-.idea/
+.idea/
+
+# next.js
+/.next/
+/out/
+

.prettierrc

@@ -1,10 +1,10 @@
-{
-  "semi": true,
-  "trailingComma": "all",
-  "singleQuote": true,
-  "printWidth": 120,
-  "tabWidth": 2,
-  "arrowParens": "always",
-  "endOfLine": "crlf",
-  "jsxBracketSameLine": true
-}
+{
+  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 2,
+  "arrowParens": "always",
+  "endOfLine": "crlf",
+  "jsxBracketSameLine": true
+}

Dockerfile

@@ -1,12 +1,12 @@
-FROM node:16
+FROM node:20
 
 ENV NODE_ENV=production
 
 ARG API_URI=http://localhost:3001
-ENV REACT_APP_API_URI $API_URI
+ENV NEXT_PUBLIC_API_URI $API_URI
 
 ARG API_TIMEOUT=5000
-ENV REACT_APP_API_TIMEOUT $API_TIMEOUT
+ENV NEXT_PUBLIC_API_TIMEOUT $API_TIMEOUT
 
 WORKDIR /srv/app
 
@@ -19,7 +19,7 @@ USER node
 # Node has the uid 1000
 COPY --chown=node:node package.json pnpm-lock.yaml ./
 
-RUN pnpm install --frozen-lockfile
+RUN pnpm install --frozen-lockfile --production=false
 
 COPY --chown=node:node ./ ./
 
@@ -29,4 +29,4 @@ RUN pnpm build
 # Prunes devDependencies
 RUN pnpm install --production --ignore-scripts --prefer-offline
 
-CMD pnpm start
+CMD pnpm start

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 UNG
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019-2023 UNG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,5 @@
-# UA Bouffe API
-[![Build Status](https://travis-ci.org/ungdev/UA-bouffe.svg?branch=master)](https://travis-ci.org/ungdev/UA-bouffe)
+# UA Bouffe Front
+[![Build status](https://github.com/ungdev/UA-bouffe-front/actions/workflows/ci.yml/badge.svg)](https://github.com/ungdev/UA-bouffe-front/actions/workflows/ci.yml)
 
 Console de vente de l'UTT Arena
 
@@ -11,27 +11,39 @@ Console de vente de l'UTT Arena
 - Pnpm
 
 ### Installation de l'application
+Voir [UA-bouffe](https://github.com/ungdev/UA-bouffe)
+
+Anciennes instructions :
 ```
-git clone https://github.com/ungdev/UA-bouffe
+git clone https://github.com/ungdev/UA-bouffe-front
 cp .env.example .env
-pnpm
+pnpm i
 ```
+
 ## 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
+
+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
+pnpm lint:fix
 ```
 
 ### Démarrer l'API en production
+
 ```
 pnpm build
 pnpm start
 ```
+
 ### Licence
+
 Le code est sous licence MIT.