Updating Axios and other Dependencies (#270)

* Update main.yml

* Readme change (#253)

* Update main.yml

* Update main.yml

* Update dependency react-bootstrap to v2.9.1 (#245)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-select to v5.7.7 (#243)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-router-dom to v6.18.0 (#232)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Updating client/package-lock.json

* Update dependency natural to v6.8.0 (#244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency html-react-parser to v5 (#249)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express-fileupload to v1.4.2 (#242)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-icons to v4.12.0 (#260)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update renovate.json

Adding automerge for High/Very High PR

* Update renovate.json

* changing node and npm version in github action

* Axios Dependency Update (#268)

* Bump axios from 0.27.2 to 1.6.0 in /server

Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump axios from 0.27.2 to 1.6.0 in /client

Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* axios update

* add extension of dependencies to files

* add axios import to files

* added versions of Node and NPM to README.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency react-select to v5.8.0 (#255)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @testing-library/react to v14.1.2 (#256)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency react-router-dom to v6.20.1 (#261)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency express-fileupload to v1.4.3 (#263)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /client (#264)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependency nodemon to v3.0.2 (#265)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency axios to v1.6.2 (#269)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* remove unnecessary files

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/main.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - prod
 
 jobs:
   build_test:
@@ -19,10 +20,10 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4.0.0
         with:
-          node-version: 20.9.0
+          node-version: 21.4.0
 
       - name: Setup Npm
-        run: npm install -g npm@10.2.3
+        run: npm install -g npm@10.2.4
 
       - name: Install client dependencies
         run: cd client && npm install && cd ..
@@ -33,7 +34,7 @@ jobs:
       - name: Build client
         run: cd client && npm run build && cd ..
 
-      - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' || github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'prod' || github.event_name == 'push' && github.ref == 'refs/heads/prod' }}
         name: Frontend Tests
         run: cd client && npm run test && cd ..
 

.gitignore

@@ -1,2 +1,3 @@
 .env
 node_modules/
+.vscode/

README.md

@@ -94,20 +94,23 @@ To get a local copy up and running follow these simple example steps.
 
 <!-- This is an example of how to list things you need to use the software and how to install them. -->
 
-* NPM
+* **Node.js** (Version 21.4.0)
   ```sh
-  sudo apt install npm
+  sudo apt install nodejs
   ```
 
-* Node.js
+* **NPM** (Version 10.2.4)
   ```sh
-  sudo apt install nodejs
+  sudo apt install npm
   ```
 
-* PostgreSQL
+> ❗ You can also use Node Version Manager ([NVM](https://github.com/nvm-sh/nvm)) to install Node.js and NPM
+
+* **PostgreSQL**
   ```sh
   sudo apt install postgresql
   ```
+  ...or use Docker ([see below](?tab=readme-ov-file#alternative-docker-for-database))
 
 ### Installation
 
@@ -122,7 +125,7 @@ To get a local copy up and running follow these simple example steps.
    ```
 3. Clone the repo
    ```sh
-	cd folder-where-i-keep-my-repos/
+   cd folder-where-i-keep-my-repos/
    git clone https://github.com/neiist-dev/neiist-website.git
    ```
 4. Server: Install NPM packages