Skip to content

Commit

Permalink
Merge branch 'release/0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
LVRodrigues committed Jan 28, 2025
2 parents b653a59 + 9a2653c commit 79b96ca
Show file tree
Hide file tree
Showing 94 changed files with 19,844 additions and 1,122 deletions.
12 changes: 12 additions & 0 deletions .devcontainer/fpa-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM node:22

# Install basic development tools
RUN apt update && apt install -y less man-db sudo

# Ensure default `node` user has access to `sudo`
ARG USERNAME=node
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME

# Set `DEVCONTAINER` environment variable to help with orientation
ENV DEVCONTAINER=true
38 changes: 38 additions & 0 deletions .devcontainer/fpa-client/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// See https://containers.dev/implementors/json_reference/ for configuration reference
{
"name": "fpa-client",
"dockerComposeFile": [
"../../docker-compose.yaml",
"docker-compose.yml"
],
// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "fpa-client",
// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspaces",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {},
"ghcr.io/stuartleeks/dev-container-features/shell-history:0": {},
"ghcr.io/schlich/devcontainer-features/powerlevel10k:1": {},
"ghcr.io/nils-geistmann/devcontainers-features/zsh:0": {},
"ghcr.io/devcontainers-extra/features/angular-cli:2": {}
},
"mounts": [
"source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/node/.ssh,type=bind"
],
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"humao.rest-client",
"bierner.markdown-mermaid",
"bpruitt-goddard.mermaid-markdown-syntax-highlighting",
"mtxr.sqltools",
"mtxr.sqltools-driver-pg",
"fill-labs.dependi"
]
}
},
"remoteUser": "node"
}
25 changes: 25 additions & 0 deletions .devcontainer/fpa-client/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
fpa-client:
# Uncomment if you want to override the service's Dockerfile to one in the .devcontainer
# folder. Note that the path of the Dockerfile and context is relative to the *primary*
# docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
# array). The sample below assumes your primary file is in the root of your project.
#
build:
context: .
dockerfile: .devcontainer/fpa-client/Dockerfile

volumes:
# Update this to wherever you want VS Code to mount the folder of your project
- .:/workspaces:cached

# Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
# cap_add:
# - SYS_PTRACE
# security_opt:
# - seccomp:unconfined

# Overrides default command so things don't shut down after the process ends.
command: sleep infinity

9 changes: 8 additions & 1 deletion .devcontainer/fpa-server/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": ["humao.rest-client"]
"extensions": [
"humao.rest-client",
"bierner.markdown-mermaid",
"bpruitt-goddard.mermaid-markdown-syntax-highlighting",
"mtxr.sqltools",
"mtxr.sqltools-driver-pg",
"fill-labs.dependi"
]
}
},

Expand Down
1 change: 0 additions & 1 deletion .devcontainer/fpa-server/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.8'
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
fpa-server:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Cargo.lock

# DBEaver config
.dbeaver
.project
.project
4 changes: 4 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
}
15 changes: 12 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,18 @@
"args": [],
"cwd": "${workspaceFolder}/fpa-server",
"env": {
"RUST_BACKTRACE": "1"
"RUST_BACKTRACE": "1",
"RUST_LOG": "debug",
"axum::rejection": "trace"
}
}

},
{
"name": "FPA Client",
"type": "chrome",
"request": "launch",
"preLaunchTask": "fpa-client start",
"url": "http://localhost:4200/",
"cwd": "${workspaceFolder}/fpa-client"
},
]
}
9 changes: 4 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"cmake.configureOnOpen": false,
"rust-analyzer.linkedProjects": [
"./fpa-server/Cargo.toml",
"./fpa-server/Cargo.toml",
"./fpa-server/Cargo.toml",
"./fpa-server/Cargo.toml"
],
"sqltools.connections": [
{
"previewLimit": 50,
"server": "localhost",
"server": "database",
"port": 5432,
"driver": "PostgreSQL",
"name": "FPA Admin",
Expand All @@ -18,5 +15,7 @@
"username": "fpa-admin",
"password": "fpa-pass"
}
]
],
"todo-tree.tree.showBadges": true,
"todo-tree.tree.showCountsInTree": true
}
49 changes: 48 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,54 @@
"problemMatcher": [
"$eslint-stylish"
],
"group": "build"
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "fpa-client start",
"type": "npm",
"script": "start",
"isBackground": true,
"options": {
"cwd": "${workspaceFolder}/fpa-client"
},
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"label": "fpa-client test",
"type": "npm",
"script": "test",
"isBackground": true,
"options": {
"cwd": "${workspaceFolder}/fpa-client"
},
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ Project Management using Function Points Analysis.

![GitHub](https://img.shields.io/github/license/LVRodrigues/apf-calc?logo=readdotcv)

![Static Badge](https://img.shields.io/badge/postgresql-17-blue?logo=postgresql)
![Static Badge](https://img.shields.io/badge/postgresql-17.2-blue?logo=postgresql)
![Static Badge](https://img.shields.io/badge/RLS-yellow)
![Static Badge](https://img.shields.io/badge/Multi_Tennant-yellow)

![Static Badge](https://img.shields.io/badge/keycloak-26.0.0-blue?logo=openid)
![Static Badge](https://img.shields.io/badge/keycloak-26.1.0-blue?logo=openid)
![Static Badge](https://img.shields.io/badge/SSO-yellow)
![Static Badge](https://img.shields.io/badge/OAuth_2.0-yellow)
![Static Badge](https://img.shields.io/badge/OpenID_Connect-yellow)
![Static Badge](https://img.shields.io/badge/Multi_Tennant-yellow)

![Static Badge](https://img.shields.io/badge/rust-1.81-blue?logo=rust)
![Static Badge](https://img.shields.io/badge/rust-1.83-blue?logo=rust)
![Static Badge](https://img.shields.io/badge/REST_API-yellow)
![Static Badge](https://img.shields.io/badge/Axum-yellow)
![Static Badge](https://img.shields.io/badge/Sea_ORM-yellow)
![Static Badge](https://img.shields.io/badge/OpenAPI-yellow)
![Static Badge](https://img.shields.io/badge/ReDOC-yellow)

![Static Badge](https://img.shields.io/badge/angular-18.0-blue?logo=angular)
![Static Badge](https://img.shields.io/badge/angular-19.1.4-blue?logo=angular)
![Static Badge](https://img.shields.io/badge/SAAS-yellow)
![Static Badge](https://img.shields.io/badge/NGXecharts-yellow)
![Static Badge](https://img.shields.io/badge/RSA-yellow)

![Static Badge](https://img.shields.io/badge/docker-27.2.0-blue?logo=docker)
![Static Badge](https://img.shields.io/badge/docker-27.4.0-blue?logo=docker)

# Useful Links

Expand Down
10 changes: 5 additions & 5 deletions database/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM postgres:17
FROM postgres:17.2

ENV POSTGRES_PASSWORD 'postgres'
ENV POSTGRES_DB 'fpa-management'
ENV POSTGRES_USER 'fpa-admin'
ENV POSTGRES_PASSWORD 'fpa-pass'
#ENV POSTGRES_PASSWORD='postgres'
ENV POSTGRES_DB='fpa-management'
ENV POSTGRES_USER='fpa-admin'
ENV POSTGRES_PASSWORD='fpa-pass'

COPY \
setup/001-users-docker.sql \
Expand Down
Loading

0 comments on commit 79b96ca

Please sign in to comment.