Skip to content
Merged

Dev #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b94b84c
Feat: Update login - add password hash with bcrypt
fsossa Oct 21, 2025
3a161e1
Resolve conflit from page.tsx and chat.tsx
fsossa Oct 21, 2025
ba0a606
pdf loading page
Hyckael Oct 21, 2025
3060c2a
feat: change many pages
Hyckael Oct 21, 2025
ac28519
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
Hyckael Oct 21, 2025
6cd5095
Resolve conflict
fsossa Oct 21, 2025
93e7ff0
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
fsossa Oct 21, 2025
4729eae
resolve package json conflict
fsossa Oct 21, 2025
49f5094
Feat: remove passwordEncoder from userService
fsossa Oct 21, 2025
e881733
Feat: add model quiz and resume
fsossa Oct 21, 2025
7636f89
resume page update
Hyckael Oct 22, 2025
a4def42
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
BioKobena Oct 22, 2025
a09e88a
Merge pull request #13 from BioKobena/dev
BioKobena Oct 22, 2025
25bd309
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
Hyckael Oct 22, 2025
ce76526
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
fsossa Oct 22, 2025
5d7373c
quizz, resume, subject, user
BioKobena Oct 22, 2025
252e808
fix: .gitignore change
BioKobena Oct 22, 2025
7e20c94
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
fsossa Oct 22, 2025
808b288
Merge branch 'dev-reset' into dev
fsossa Oct 22, 2025
2bd0502
fix: bcrypt solution ok
BioKobena Oct 22, 2025
ed094ad
Merge branch 'dev' of https://github.com/BioKobena/pdl-studyAI into dev
fsossa Oct 22, 2025
3334302
Feat: fix spring security and set admin param
fsossa Oct 22, 2025
cbd8858
Feat: Fix api authentication by springsecurity. set csrf disabled
fsossa Oct 22, 2025
be7cef0
feat: change folder of CI/CD from root to web folder
BioKobena Oct 23, 2025
bba6053
fix: ci/cd for nextjs
BioKobena Oct 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
/frontend/web/package-lock.json
/backend/*.class

.class

# /backend/studyai_backend/src/main/java/com/
2 changes: 2 additions & 0 deletions backend/studyai_backend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
HELP.md

target/
target/*
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
Expand Down
2 changes: 2 additions & 0 deletions backend/studyai_backend/bin/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/mvnw text eol=lf
*.cmd text eol=crlf
35 changes: 35 additions & 0 deletions backend/studyai_backend/bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
HELP.md
target/
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

.env
.env*
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
46 changes: 46 additions & 0 deletions backend/studyai_backend/bin/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# # Multi-stage Dockerfile for a Spring Boot app (Maven) using MongoDB
# # Build stage
# FROM maven:3.8.8-openjdk-17-slim AS build
# WORKDIR /workspace/app

# # copy only what is needed to leverage Docker layer caching
# COPY pom.xml mvnw ./
# COPY .mvn .mvn
# RUN chmod +x ./mvnw || true
# RUN mvn -B dependency:go-offline

# # copy source and build
# COPY src ./src
# RUN mvn -B -DskipTests package

# # Runtime stage
# FROM eclipse-temurin:17-jre-jammy
# ARG JAR_FILE=/workspace/app/target/*.jar
# COPY --from=build ${JAR_FILE} /app.jar

# # non-root user
# RUN addgroup --system spring && adduser --system --ingroup spring spring
# USER spring:spring

# ENV JAVA_OPTS="-Xms256m -Xmx512m"
# # If you want a default mongo URI for local compose setups, uncomment and adjust:
# # ENV SPRING_DATA_MONGODB_URI="mongodb://mongo:27017/pdl"

# EXPOSE 8080

# ENTRYPOINT ["sh","-c","java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.jar"]


# build stage
FROM maven:3.9.4-eclipse-temurin-17 AS build
WORKDIR /app
COPY pom.xml .
COPY src ./src
RUN mvn -B -DskipTests package

# run stage
FROM eclipse-temurin:17-jre
WORKDIR /app
COPY --from=build /app/target/*.jar app.jar
EXPOSE 8080
ENTRYPOINT ["java","-jar","/app/app.jar"]
90 changes: 90 additions & 0 deletions backend/studyai_backend/bin/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# version: '3.8'
services:
mongo:
image: mongo:6.0
container_name: studyai-mongo
restart: always
environment:
MONGO_INITDB_DATABASE: studyai
ports:
- "27017:27017"
volumes:
- mongo-data:/data/db
app:
build: .
container_name: studyai-backend
depends_on:
- mongo
environment:
- MONGO_URI=mongodb://mongo:27017/studyai
- PORT=8080
ports:
- "8080:8080"
restart: on-failure

volumes:
mongo-data:


# version: "3.8"

# services:
# app:
# build:
# context: .
# dockerfile: Dockerfile
# env_file: .env
# environment:
# - NODE_ENV=development
# - DB_HOST=db
# - REDIS_HOST=redis
# ports:
# - "3000:3000" # adjust if your app listens on another port
# volumes:
# - ./:/usr/src/app
# - /usr/src/app/node_modules
# depends_on:
# db:
# condition: service_healthy
# redis:
# condition: service_started
# restart: unless-stopped
# networks:
# - backend
# # default command for a typical Node backend; change to your start command if different
# command: sh -c "npm install && npm run dev"

# db:
# image: postgres:14
# env_file: .env
# environment:
# - POSTGRES_USER
# - POSTGRES_PASSWORD
# - POSTGRES_DB
# ports:
# - "5432:5432"
# volumes:
# - db_data:/var/lib/postgresql/data
# healthcheck:
# test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
# interval: 10s
# timeout: 5s
# retries: 5
# restart: unless-stopped
# networks:
# - backend

# redis:
# image: redis:7
# ports:
# - "6379:6379"
# restart: unless-stopped
# networks:
# - backend

# volumes:
# db_data:

# networks:
# backend:
# driver: bridge
Loading
Loading