Updating Image for "Churrasco EIC" (#328)

* 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

* Update dependency natural to v6.10.4 (#262)

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

* Update dependency html-react-parser to v5.1.1 (#267)

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

* Update dependency axios to v1.6.5 (#275)

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

* Update dependency htmlparser2 to v9.1.0 (#276)

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

* Update appleboy/ssh-action action to v1.0.3 (#274)

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

* Update actions/setup-node action to v4.0.1 (#272)

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

* Update dependency nodemon to v3.0.3 (#281)

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

* add BasedInLisbon logo to the website (#286)

* Bump follow-redirects from 1.15.4 to 1.15.6 in /server (#288)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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

* Bump follow-redirects from 1.15.4 to 1.15.6 in /client (#287)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  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 @testing-library/react to v14.2.1 (#284)

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

* Update dependency axios to v1.6.8 (#283)

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

* Update dependency react-router-dom to v6.22.3 (#271)

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

* Update dependency react-icons to v5 (#282)

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

* Update dependency dotenv to v16.4.5 (#280)

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

* Update dependency autoprefixer to v10.4.18 (#279)

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

* Update actions/setup-node action to v4.0.2 (#289)

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

* Update dependency express to v4.18.3 (#291)

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

* Update dependency nodemon to v3.1.0 (#294)

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

* Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /client (#298)

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  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 react-bootstrap to v2.10.2 (#273)

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

* Update dependency bootstrap to v5.3.3 (#290)

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

* Update dependency express-fileupload to v1.5.0 (#292)

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

* Update dependency @testing-library/react to v14.2.2 (#295)

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

* Update dependency autoprefixer to v10.4.19 (#297)

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

* Bump express from 4.18.2 to 4.19.2 in /client (#299)

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

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

* Bump express from 4.18.3 to 4.19.2 in /server (#300)

Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.3...4.19.2)

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

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

* Update package.json

* Update collabs image (#313)

* removing old members

* adding new collaborators

* Bump ejs from 3.1.9 to 3.1.10 in /client (#312)

Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](mde/ejs@v3.1.9...v3.1.10)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

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

* Update actions/checkout action to v4.1.6 (#311)

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

* Update dependency @testing-library/react to v14.3.1 (#309)

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

* Update dependency react-icons to v5.2.1 (#308)

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

* Update dependency react-multi-carousel to v2.8.5 (#303)

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

* Update dependency pg to v8.11.5 (#302)

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

* Update dependency html-react-parser to v5.1.10 (#285)

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

* updating xlsx package

* Update dependency react-router-dom to v6.23.1 (#314)

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

* Update react monorepo to v18.3.1 (#315)

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

* docker-compose.yml build (#318)

* build: add docker-compose configuration

* doc: add Docker documentation and reorganizing docs

* doc: add Docker documentation and reorganizing docs

* doc: reorganizing docs

* doc: adding proxy change needed

* refactor: doc to readme and dockerfile

* refactor: doc to readme and dockerfile

* refactor: doc to readme and dockerfile

* fix: refactor docker command to correct location

* doc: correct installation md

* chore(deps): update dependency nodemon to v3.1.2 (#321)

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

* Update dependency axios to v1.7.2 (#317)

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

* Updated "Churrasco EIC" image (#324)

* Bump braces from 3.0.2 to 3.0.3 in /server (#326)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

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

* chore(deps): update actions/checkout action to v4.1.7 (#325)

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

* fix(deps): update dependency pg to v8.12.0 (#323)

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

* chore(deps): update dependency nodemon to v3.1.3 (#322)

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

* Bump braces from 3.0.2 to 3.0.3 in /client (#327)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

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

---------

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>
Co-authored-by: Diogo Pereira <126073236+Pereira2303@users.noreply.github.com>
Co-authored-by: Miguel Mendo <mrquatrelle@proton.me>
Co-authored-by: Francisca105 <franciscaalmeida023@gmail.com>

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Setup Node
         uses: actions/setup-node@v4.0.2

README.md

@@ -25,8 +25,6 @@
     <a href="https://neiist.tecnico.ulisboa.pt"><strong>Go to Website »</strong></a>
     <br />
     <br />
-    <!-- <a href="https://github.com/othneildrew/Best-README-Template">View Demo</a>
-    · -->
     <a href="https://github.com/neiist-dev/neiist-website/issues">Report Bug</a>
     ·
     <a href="https://github.com/neiist-dev/neiist-website/issues">Request Feature</a>
@@ -79,104 +77,13 @@ Of course, no one template will serve all projects since your needs may be diffe
 
 A list of commonly used resources that I find helpful are listed in the acknowledgements. -->
 
-### Built With 
+### Getting Started
 
-> [React](https://reactjs.org/), [React Bootstrap](https://react-bootstrap.github.io/), [Node.js](https://nodejs.org/en/), [Express](http://expressjs.com/), [PostgreSQL](https://www.postgresql.org/)
+* [Installation](./readme/installation.md)
 
+### Built With
 
-<!-- GETTING STARTED -->
-## Getting Started
-
-<!-- This is an example of how you may give instructions on setting up your project locally. -->
-To get a local copy up and running follow these simple example steps.
-
-### Prerequisites
-
-<!-- This is an example of how to list things you need to use the software and how to install them. -->
-
-* **Node.js** (Version 21.4.0)
-  ```sh
-  sudo apt install nodejs
-  ```
-
-* **NPM** (Version 10.2.4)
-  ```sh
-  sudo apt install npm
-  ```
-
-> ❗ 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
-
-1. Create a Fénix application with a Redirect Url of `http://localhost:3000/` and a Scope of `Informações` at [https://fenix.tecnico.ulisboa.pt/personal/external-applications/#/applications](https://fenix.tecnico.ulisboa.pt/personal/external-applications/#/applications)
-2. Create a PostgreSQL database
-   ```sh
-   sudo -i -u postgres
-   psql
-   CREATE DATABASE neiist;
-   \q
-   exit
-   ```
-3. Clone the repo
-   ```sh
-   cd folder-where-i-keep-my-repos/
-   git clone https://github.com/neiist-dev/neiist-website.git
-   ```
-4. Server: Install NPM packages
-   ```sh
-   cd server/
-   npm install
-   ```
-5. Server: Create .env file
-   ```sh
-   cp .env.example .env
-   ```
-6. Server: Populate the .env file with your Fénix application and database credentials
-7. Server: Run
-   ```sh
-   npm start
-   ```
-8. Client: Install NPM packages
-   ```sh
-   cd ../client/
-   npm install
-   ```
-9. Client: Create .env file
-   ```sh
-   cp .env.example .env
-   ```
-10. Client: Populate the .env file with your Fénix application credentials
-11. Client: Run
-    ```sh
-    npm start
-    ```
-
-
-### Alternative: Docker for database
-
-1. Pull postgres image
-   ```sh
-   docker pull postgres:alpine
-   ```
-2. Create and run the container
-   ```sh
-   docker run -itd -e POSTGRES_PASSWORD=<PASSWORD> -p 5432:5432 -v <HOST_FOLDER>:/var/lib/postgresql/data --name postgresql postgres:alpine
-   ```
-3. Create database
-   ```sh
-   docker exec -it postgresql bash
-   psql -U postgres
-   CREATE DATABASE neiist;
-   \q
-   exit
-   ```
-Note: the env variable PGHOST should be localhost
+> [React](https://reactjs.org/), [React Bootstrap](https://react-bootstrap.github.io/), [Node.js](https://nodejs.org/en/), [Express](http://expressjs.com/), [PostgreSQL](https://www.postgresql.org/)
 
 
 <!-- USAGE EXAMPLES -->

build/.env.example

@@ -0,0 +1,17 @@
+NPM_COMMAND=start
+
+CLIENT_NAME=client
+CLIENT_PORT=3000
+CLIENT_FOLDER=client
+
+SERVER_NAME=server
+SERVER_PORT=3001
+SERVER_FOLDER=server
+
+POSTGRES_NAME=postgres
+POSTGRES_PORT=5432
+POSTGRES_IMAGE=postgres:alpine
+
+POSTGRES_DB=neiist
+POSTGRES_USER=
+POSTGRES_PASSWORD=

build/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:21.4.0-bullseye-slim
+
+WORKDIR /opt/app
+
+COPY ./package*.json /opt/app/
+RUN npm install
+
+COPY ./ /opt/app
+
+ARG PORT
+EXPOSE $PORT
+
+ENTRYPOINT ["npm"]

build/docker-compose.yml

@@ -0,0 +1,56 @@
+name: neiist
+services:
+  client:
+    container_name: $CLIENT_NAME
+    build:
+      context: ../client/
+      dockerfile: ../build/Dockerfile
+      args:
+        PORT: $CLIENT_PORT
+    ports:
+      - $CLIENT_PORT:$CLIENT_PORT
+    volumes:
+      - ../client/:/opt/app/
+      - /opt/app/node_modules
+    command: $NPM_COMMAND
+    depends_on:
+      - server
+
+  server:
+    container_name: $SERVER_NAME
+    build:
+      context: ../server/
+      dockerfile: ../build/Dockerfile
+      args:
+        PORT: $SERVER_PORT
+    environment:
+      PGHOST: ${PGHOST:-postgres}
+    ports:
+      - $SERVER_PORT:$SERVER_PORT
+    volumes:
+      - ../server/:/opt/app/
+      - /opt/app/node_modules
+    command: $NPM_COMMAND
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+  postgres:
+    container_name: $POSTGRES_NAME
+    image: $POSTGRES_IMAGE
+    environment:
+      POSTGRES_DB: $POSTGRES_DB
+      POSTGRES_PORT: $POSTGRES_PORT
+      POSTGRES_USER: $POSTGRES_USER
+      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+    ports:
+      - $POSTGRES_PORT:$POSTGRES_PORT
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $POSTGRES_DB -U $POSTGRES_USER"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  postgres_data:

client/package.json

@@ -5,10 +5,9 @@
   "dependencies": {
     "@mantine/core": "^6.0.8",
     "@mantine/hooks": "^6.0.8",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
     "bootstrap": "5.3.3",
     "html-react-parser": "^5.0.0",
-
     "react": "18.3.1",
     "react-bootstrap": "2.10.2",
     "react-device-detect": "^2.2.2",