Compare commits
8 Commits
gradle-set
...
c4e60bee2a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c4e60bee2a | ||
|
|
6a37419cf6 | ||
|
|
3b4003ff01 | ||
|
|
d12425d90a | ||
|
|
370ac7d814 | ||
|
|
f13fc79d92 | ||
|
|
0bec920670 | ||
|
|
021e0ce784 |
@@ -1,75 +0,0 @@
|
|||||||
name: Build and Deploy Java Gradle Application
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: 📄 Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: 📄 Checkout configuration
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_PROPERTIES_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
git clone -b hexagonal-reforged ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no'
|
|
||||||
|
|
||||||
- name: 📄 Edit configuration
|
|
||||||
run: |
|
|
||||||
sed -i "s/<POSTGRES_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_user)/g" ./codiki-properties/application-prod.yml
|
|
||||||
cp ./codiki-properties/application-prod.yml ./backend/codiki-launcher/src/main/resources/application.yml
|
|
||||||
sed -i "s/<POSTGRES_ADMIN_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_admin)/g" ./docker-compose.yml
|
|
||||||
|
|
||||||
- name: 🔨 Build backend docker image
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker build -t codiki-backend -f ./Dockerfile-backend . --no-cache
|
|
||||||
|
|
||||||
- name: 📦 Extract backend docker image into archive
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker save codiki-backend:latest -o ./codiki-backend.tar
|
|
||||||
|
|
||||||
- name: 🔨 Build frontend docker image
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker build -t codiki-frontend -f ./Dockerfile-frontend . --no-cache
|
|
||||||
|
|
||||||
- name: 📦 Extract frontend docker image into archive
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker save codiki-frontend:latest -o ./codiki-frontend.tar
|
|
||||||
|
|
||||||
- name: 📤 Transfer artifacts to remote server
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
|
|
||||||
REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
|
|
||||||
REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
|
|
||||||
REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
|
|
||||||
REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./codiki-backend.tar $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./codiki-frontend.tar $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./docker-compose.yml $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
|
|
||||||
- name: 🚀 Launch application onto remote server
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
|
|
||||||
REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
|
|
||||||
REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
|
|
||||||
REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
|
|
||||||
REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
|
|
||||||
run: |
|
|
||||||
ssh -o StrictHostKeyChecking=no $REMOTE_HOST -l $REMOTE_USER -p $REMOTE_PORT << EOC
|
|
||||||
cd $REMOTE_PATH
|
|
||||||
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar
|
|
||||||
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar
|
|
||||||
sudo /usr/bin/docker compose down
|
|
||||||
sudo /usr/bin/docker compose up --detach
|
|
||||||
EOC
|
|
||||||
10
.gitignore
vendored
10
.gitignore
vendored
@@ -84,13 +84,3 @@ testem.log
|
|||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
|
||||||
**/ci/bin/
|
**/ci/bin/
|
||||||
|
|
||||||
|
|
||||||
# Linux start script should use lf
|
|
||||||
/gradlew text eol=lf
|
|
||||||
# These are Windows script files and should use crlf
|
|
||||||
*.bat text eol=crlf
|
|
||||||
# Binary files should be left untouched
|
|
||||||
*.jar binary
|
|
||||||
|
|
||||||
**/.gradle
|
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
FROM gradle:9.0.0-jdk21 AS builder
|
FROM maven:3.9.9-eclipse-temurin-21 AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY backend/gradlew /app/
|
COPY backend/pom.xml /app/
|
||||||
COPY backend/build.gradle.kts /app/
|
|
||||||
COPY backend/settings.gradle.kts /app/
|
|
||||||
COPY backend/codiki-application /app/codiki-application
|
COPY backend/codiki-application /app/codiki-application
|
||||||
COPY backend/codiki-domain /app/codiki-domain
|
COPY backend/codiki-domain /app/codiki-domain
|
||||||
COPY backend/codiki-exposition /app/codiki-exposition
|
COPY backend/codiki-exposition /app/codiki-exposition
|
||||||
COPY backend/codiki-infrastructure /app/codiki-infrastructure
|
COPY backend/codiki-infrastructure /app/codiki-infrastructure
|
||||||
COPY backend/codiki-launcher /app/codiki-launcher
|
COPY backend/codiki-launcher /app/codiki-launcher
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN gradle build jar
|
RUN mvn clean install -N
|
||||||
|
RUN mvn clean package
|
||||||
|
|
||||||
FROM eclipse-temurin:21-jre-alpine AS final
|
FROM eclipse-temurin:21-jre-alpine AS final
|
||||||
COPY --from=builder /app/codiki-launcher/build/libs/codiki-launcher.jar /app/codiki.jar
|
COPY --from=builder /app/codiki-launcher/target/*.jar /app/codiki.jar
|
||||||
CMD ["java", "-jar", "/app/codiki.jar"]
|
CMD ["java", "-jar", "/app/codiki.jar"]
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
FROM node:24-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY frontend /app
|
COPY frontend /app
|
||||||
RUN npm install
|
RUN npm install
|
||||||
RUN npm run build-prod-en
|
RUN npm run build-prod-en
|
||||||
RUN npm run build-prod-fr
|
RUN npm run build-prod-fr
|
||||||
|
|
||||||
FROM nginx:1.29-alpine AS final
|
FROM nginx:1.27-alpine AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /app/dist/codiki/en/browser /usr/share/nginx/html/en/
|
COPY --from=builder /app/dist/codiki/en/browser /usr/share/nginx/html/en/
|
||||||
COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
|
COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
plugins {
|
|
||||||
kotlin("jvm") version "2.2.20"
|
|
||||||
kotlin("plugin.spring") version "2.2.20"
|
|
||||||
id("io.spring.dependency-management") version "1.1.7"
|
|
||||||
}
|
|
||||||
|
|
||||||
group = "org.codiki"
|
|
||||||
version = "0.0.1-SNAPSHOT"
|
|
||||||
|
|
||||||
java {
|
|
||||||
toolchain {
|
|
||||||
languageVersion = JavaLanguageVersion.of(21)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
subprojects {
|
|
||||||
apply(plugin = "java")
|
|
||||||
apply(plugin = "org.jetbrains.kotlin.jvm")
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(platform("org.springframework.boot:spring-boot-dependencies:3.5.5"))
|
|
||||||
compileOnly("org.projectlombok:lombok:1.18.40")
|
|
||||||
annotationProcessor("org.projectlombok:lombok:1.18.40")
|
|
||||||
testImplementation("org.assertj:assertj-core:3.27.4")
|
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter-api")
|
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter-params")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType<Test> {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencyManagement {
|
|
||||||
imports {
|
|
||||||
mavenBom("org.springframework.boot:spring-boot-dependencies:3.5.5")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
kotlin {
|
|
||||||
compilerOptions {
|
|
||||||
freeCompilerArgs.addAll("-Xjsr305=strict")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType<Test> {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("io.spring.dependency-management") version "1.1.7"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(project(":codiki-domain"))
|
|
||||||
implementation("org.springframework:spring-context")
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-security")
|
|
||||||
implementation("com.auth0:java-jwt:4.5.0")
|
|
||||||
implementation("org.apache.commons:commons-lang3") //:3.18.0
|
|
||||||
}
|
|
||||||
56
backend/codiki-application/pom.xml
Normal file
56
backend/codiki-application/pom.xml
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>codiki-application</artifactId>
|
||||||
|
|
||||||
|
<name>codiki-application</name>
|
||||||
|
<description>Demo project for Spring Boot</description>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-domain</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-security</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.auth0</groupId>
|
||||||
|
<artifactId>java-jwt</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-lang3</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-api</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-params</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.assertj</groupId>
|
||||||
|
<artifactId>assertj-core</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
30
backend/codiki-domain/pom.xml
Normal file
30
backend/codiki-domain/pom.xml
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>codiki-domain</artifactId>
|
||||||
|
|
||||||
|
<name>codiki-domain</name>
|
||||||
|
<description>Demo project for Spring Boot</description>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<source>16</source>
|
||||||
|
<target>16</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
</project>
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("io.spring.dependency-management") version "1.1.7"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(project(":codiki-application"))
|
|
||||||
implementation(project(":codiki-domain"))
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-security")
|
|
||||||
implementation("org.apache.tika:tika-core:3.2.3")
|
|
||||||
}
|
|
||||||
60
backend/codiki-exposition/pom.xml
Normal file
60
backend/codiki-exposition/pom.xml
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>codiki-exposition</artifactId>
|
||||||
|
|
||||||
|
<name>codiki-exposition</name>
|
||||||
|
<description>Demo project for Spring Boot</description>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-application</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tika</groupId>
|
||||||
|
<artifactId>tika-core</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-data-jpa</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-security</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.postgresql</groupId>-->
|
||||||
|
<!-- <artifactId>postgresql</artifactId>-->
|
||||||
|
<!-- <scope>runtime</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-test</artifactId>-->
|
||||||
|
<!-- <scope>test</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.security</groupId>-->
|
||||||
|
<!-- <artifactId>spring-security-test</artifactId>-->
|
||||||
|
<!-- <scope>test</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("io.spring.dependency-management") version "1.1.7"
|
|
||||||
// kotlin("plugin.jpa") version "2.1.20"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
// implementation(kotlin("stdlib"))
|
|
||||||
implementation(project(":codiki-application"))
|
|
||||||
implementation(project(":codiki-domain"))
|
|
||||||
implementation("org.springframework:spring-context")
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
|
|
||||||
implementation("org.postgresql:postgresql:42.7.5")
|
|
||||||
}
|
|
||||||
60
backend/codiki-infrastructure/pom.xml
Normal file
60
backend/codiki-infrastructure/pom.xml
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>codiki-infrastructure</artifactId>
|
||||||
|
|
||||||
|
<name>codiki-infrastructure</name>
|
||||||
|
<description>Demo project for Spring Boot</description>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-domain</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.postgresql</groupId>
|
||||||
|
<artifactId>postgresql</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-lang3</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-api</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-params</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.assertj</groupId>
|
||||||
|
<artifactId>assertj-core</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("org.springframework.boot") version "3.5.5"
|
|
||||||
id("io.spring.dependency-management") version "1.1.7"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(project(":codiki-domain"))
|
|
||||||
implementation(project(":codiki-application"))
|
|
||||||
implementation(project(":codiki-infrastructure"))
|
|
||||||
implementation(project(":codiki-exposition"))
|
|
||||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
|
||||||
implementation("org.springframework.boot:spring-boot-devtools")
|
|
||||||
}
|
|
||||||
|
|
||||||
springBoot {
|
|
||||||
mainClass = "org.codiki.launcher.ApplicationLauncher"
|
|
||||||
}
|
|
||||||
57
backend/codiki-launcher/pom.xml
Normal file
57
backend/codiki-launcher/pom.xml
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<relativePath/> <!-- lookup parent from repository -->
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>codiki-launcher</artifactId>
|
||||||
|
|
||||||
|
<name>codiki-launcher</name>
|
||||||
|
<description>Demo project for Spring Boot</description>
|
||||||
|
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-exposition</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-application</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-domain</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-infrastructure</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>repackage</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
application:
|
application:
|
||||||
pictures:
|
pictures:
|
||||||
path: /Users/florian/Documents/Developpement/codiki-hexagonal/backend/pictures-folder/
|
path: /home/florian/Developpement/codiki-hexagonal/backend/pictures-folder/
|
||||||
temp-path : /Users/florian/Documents/Developpement/codiki-hexagonal/backend/pictures-folder/temp/
|
temp-path : /home/florian/Developpement/codiki-hexagonal/backend/pictures-folder/temp/
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3.9'
|
|||||||
services:
|
services:
|
||||||
codiki-database:
|
codiki-database:
|
||||||
container_name: "codiki-database"
|
container_name: "codiki-database"
|
||||||
image: "postgres:17"
|
image: "postgres:16"
|
||||||
ports:
|
ports:
|
||||||
- "50001:5432"
|
- "50001:5432"
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
251
backend/gradlew
vendored
251
backend/gradlew
vendored
@@ -1,251 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015 the original authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# This is normally unused
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH="\\\"\\\""
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
if ! command -v java >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
||||||
# and any embedded shellness will be escaped.
|
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
||||||
# treated as '${Hostname}' itself on the command line.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
94
backend/gradlew.bat
vendored
94
backend/gradlew.bat
vendored
@@ -1,94 +0,0 @@
|
|||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
100
backend/pom.xml
Normal file
100
backend/pom.xml
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-parent</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<name>codiki</name>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<java.version>21</java.version>
|
||||||
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
|
<maven.compiler.target>21</maven.compiler.target>
|
||||||
|
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
|
||||||
|
<java-jwt.version>4.4.0</java-jwt.version>
|
||||||
|
<postgresql.version>42.7.0</postgresql.version>
|
||||||
|
<tika-core.version>2.9.0</tika-core.version>
|
||||||
|
<commons-lang3.version>3.14.0</commons-lang3.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<modules>
|
||||||
|
<module>codiki-domain</module>
|
||||||
|
<module>codiki-application</module>
|
||||||
|
<module>codiki-infrastructure</module>
|
||||||
|
<module>codiki-exposition</module>
|
||||||
|
<module>codiki-launcher</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
<dependencyManagement>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-dependencies</artifactId>
|
||||||
|
<version>3.2.0</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-exposition</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-application</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-domain</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codiki</groupId>
|
||||||
|
<artifactId>codiki-infrastructure</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.servlet</groupId>
|
||||||
|
<artifactId>jakarta.servlet-api</artifactId>
|
||||||
|
<version>${jakarta.servlet-api.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.auth0</groupId>
|
||||||
|
<artifactId>java-jwt</artifactId>
|
||||||
|
<version>${java-jwt.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.postgresql</groupId>
|
||||||
|
<artifactId>postgresql</artifactId>
|
||||||
|
<version>${postgresql.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tika</groupId>
|
||||||
|
<artifactId>tika-core</artifactId>
|
||||||
|
<version>${tika-core.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-lang3</artifactId>
|
||||||
|
<version>${commons-lang3.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
</dependencyManagement>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
rootProject.name = "codiki-backend"
|
|
||||||
include("codiki-domain", "codiki-application", "codiki-exposition", "codiki-infrastructure", "codiki-launcher")
|
|
||||||
@@ -44,7 +44,7 @@ http {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^/api {
|
location ~ ^/api {
|
||||||
proxy_pass http://192.168.1.153:50011;
|
proxy_pass http://192.168.0.153:50011;
|
||||||
proxy_set_header Host $host:$server_port;
|
proxy_set_header Host $host:$server_port;
|
||||||
proxy_set_header X-Forwarded-Host $server_name;
|
proxy_set_header X-Forwarded-Host $server_name;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<h1>{{title}}</h1>
|
<h1>{{title}}</h1>
|
||||||
<h2>{{description}}</h2>
|
<h2>{{description}}</h2>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button" class="cod-button secondary" (click)="closeDialog()" matRipple i18n>
|
<button type="button" class="cod-btn secondary" (click)="closeDialog()" matRipple i18n>
|
||||||
No
|
No
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="cod-button" (click)="closeAndValidate()" matRipple i18n>
|
<button type="button" class="cod-btn" (click)="closeAndValidate()" matRipple i18n>
|
||||||
Yes
|
Yes
|
||||||
</button>
|
</button>
|
||||||
</footer>
|
</footer>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<div class="left">
|
<div class="left">
|
||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="sideMenu.open()"
|
(click)="sideMenu.open()"
|
||||||
class="cod-button icon"
|
class="cod-btn icon"
|
||||||
matTooltip="Click to show side menu"
|
matTooltip="Click to show side menu"
|
||||||
matRipple
|
matRipple
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<div class="right">
|
<div class="right">
|
||||||
@if (isAuthenticated) {
|
@if (isAuthenticated) {
|
||||||
<button type="button"
|
<button type="button"
|
||||||
class="cod-button icon"
|
class="cod-btn icon"
|
||||||
[matMenuTriggerFor]="authenticatedUserMenu"
|
[matMenuTriggerFor]="authenticatedUserMenu"
|
||||||
matRipple>
|
matRipple>
|
||||||
<mat-icon>more_vert</mat-icon>
|
<mat-icon>more_vert</mat-icon>
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
} @else {
|
} @else {
|
||||||
<a [routerLink]="['/login']" class="cod-button" matRipple i18n>Login</a>
|
<a [routerLink]="['/login']" class="cod-btn" matRipple i18n>Login</a>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<app-side-menu #sideMenu></app-side-menu>
|
<app-side-menu #sideMenu></app-side-menu>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="closeDialog()"
|
(click)="closeDialog()"
|
||||||
class="cod-button icon secondary close"
|
class="cod-btn icon secondary close"
|
||||||
matTooltip="Close"
|
matTooltip="Close"
|
||||||
matRipple
|
matRipple
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
@@ -27,10 +27,10 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions reversed">
|
||||||
<button type="submit" class="cod-button" matRipple i18n>
|
<button type="submit" class="cod-btn" matRipple i18n>
|
||||||
Validate
|
Validate
|
||||||
</button>
|
</button>
|
||||||
<button type="button" (click)="closeDialog()" class="cod-button secondary" matRipple i18n>
|
<button type="button" (click)="closeDialog()" class="cod-btn secondary" matRipple i18n>
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="closeDialog()"
|
(click)="closeDialog()"
|
||||||
class="cod-button icon secondary close"
|
class="cod-btn icon secondary close"
|
||||||
matTooltip="Close"
|
matTooltip="Close"
|
||||||
matRipple
|
matRipple
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
@@ -26,14 +26,14 @@
|
|||||||
<footer>
|
<footer>
|
||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="closeDialog()"
|
(click)="closeDialog()"
|
||||||
class="cod-button secondary"
|
class="cod-btn secondary"
|
||||||
matRipple
|
matRipple
|
||||||
i18n>
|
i18n>
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="fileUpload.click()"
|
(click)="fileUpload.click()"
|
||||||
class="cod-button"
|
class="cod-btn"
|
||||||
matRipple
|
matRipple
|
||||||
i18n>
|
i18n>
|
||||||
<mat-icon>upload_file</mat-icon>
|
<mat-icon>upload_file</mat-icon>
|
||||||
|
|||||||
@@ -122,7 +122,7 @@
|
|||||||
<footer>
|
<footer>
|
||||||
<app-submit-button [requestPending]="!!(isSaving$ | async)" i18n>Save</app-submit-button>
|
<app-submit-button [requestPending]="!!(isSaving$ | async)" i18n>Save</app-submit-button>
|
||||||
<button type="button"
|
<button type="button"
|
||||||
class="cod-button secondary"
|
class="cod-btn secondary"
|
||||||
(click)="goPreviousLocation()"
|
(click)="goPreviousLocation()"
|
||||||
matRipple
|
matRipple
|
||||||
i18n>
|
i18n>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { CommonModule, Location } from "@angular/common";
|
import { CommonModule, Location } from "@angular/common";
|
||||||
import { Component, EventEmitter, inject, Input, OnChanges, OnDestroy, Output } from "@angular/core";
|
import { Component, EventEmitter, inject, Input, OnChanges, OnDestroy, Output } from "@angular/core";
|
||||||
import { FormGroup, ReactiveFormsModule } from "@angular/forms";
|
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
|
||||||
import { MatDialogModule } from "@angular/material/dialog";
|
import { MatDialogModule } from "@angular/material/dialog";
|
||||||
import { MatIconModule } from "@angular/material/icon";
|
import { MatIconModule } from "@angular/material/icon";
|
||||||
import { MatInputModule } from "@angular/material/input";
|
import { MatInputModule } from "@angular/material/input";
|
||||||
@@ -50,13 +50,18 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
|
|||||||
|
|
||||||
publicationInEdition!: Publication;
|
publicationInEdition!: Publication;
|
||||||
private readonly categoryService = inject(CategoryService);
|
private readonly categoryService = inject(CategoryService);
|
||||||
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
private readonly location = inject(Location);
|
private readonly location = inject(Location);
|
||||||
private readonly publicationEditionService = inject(PublicationEditionService);
|
private readonly publicationEditionService = inject(PublicationEditionService);
|
||||||
private subscriptions: Subscription[] = [];
|
private subscriptions: Subscription[] = [];
|
||||||
|
|
||||||
get publicationEditionForm(): FormGroup {
|
publicationEditionForm: FormGroup = this.formBuilder.group({
|
||||||
return this.publicationEditionService.publicationEditionForm;
|
title: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
}
|
description: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
|
text: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
|
illustrationId: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
|
categoryId: new FormControl<string | undefined>('', [Validators.required])
|
||||||
|
});
|
||||||
|
|
||||||
get isLoading$(): Observable<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.publicationEditionService.isLoading$;
|
return this.publicationEditionService.isLoading$;
|
||||||
@@ -93,10 +98,48 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
|
|||||||
ngOnChanges(): void {
|
ngOnChanges(): void {
|
||||||
this.ngOnDestroy();
|
this.ngOnDestroy();
|
||||||
|
|
||||||
if (!this.publicationInEdition || this.publicationInEdition !== this.publication) {
|
this.publicationInEdition = this.publication;
|
||||||
this.publicationInEdition = this.publication;
|
this.publicationEditionService.init(this.publicationInEdition);
|
||||||
this.publicationEditionService.init(this.publicationInEdition);
|
|
||||||
}
|
['title', 'description', 'text'].forEach(fieldName => {
|
||||||
|
const fieldSubscription = this.publicationEditionForm.controls[fieldName].valueChanges
|
||||||
|
.pipe(
|
||||||
|
map(value => value?.length ? value as string : '')
|
||||||
|
)
|
||||||
|
.subscribe(fieldValue => {
|
||||||
|
switch (fieldName) {
|
||||||
|
case 'title':
|
||||||
|
this.publicationEditionService.editTitle(fieldValue);
|
||||||
|
break;
|
||||||
|
case 'description':
|
||||||
|
this.publicationEditionService.editDescription(fieldValue);
|
||||||
|
break;
|
||||||
|
case 'text':
|
||||||
|
this.publicationEditionService.editText(fieldValue);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.subscriptions.push(fieldSubscription);
|
||||||
|
});
|
||||||
|
|
||||||
|
const categoryIdChangeSubscription = this.publicationEditionForm.controls['categoryId'].valueChanges
|
||||||
|
.subscribe(newCategoryId => {
|
||||||
|
this.publicationEditionService.editCategoryId(newCategoryId);
|
||||||
|
});
|
||||||
|
this.subscriptions.push(categoryIdChangeSubscription);
|
||||||
|
|
||||||
|
const publicationSubscription = this.publicationEditionService.state$.subscribe(state => {
|
||||||
|
console.log(state.publication.parsedText.substring(0, 15));
|
||||||
|
this.publicationInEdition = state.publication;
|
||||||
|
this.publicationEditionForm.controls['title'].setValue(this.publicationInEdition.title, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['description'].setValue(this.publicationInEdition.description, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['text'].setValue(this.publicationInEdition.text, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['illustrationId'].setValue(this.publicationInEdition.illustrationId, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['categoryId'].setValue(this.publicationInEdition.categoryId, { emitEvent: false });
|
||||||
|
});
|
||||||
|
this.subscriptions.push(publicationSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
ngOnDestroy(): void {
|
||||||
@@ -123,6 +166,10 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
|
|||||||
this.publicationEditionService.displayCodeBlockDialog();
|
this.publicationEditionService.displayCodeBlockDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
save(): void {
|
||||||
|
this.publicationSave.emit(this.publicationInEdition);
|
||||||
|
}
|
||||||
|
|
||||||
displayPictureSectionDialog(): void {
|
displayPictureSectionDialog(): void {
|
||||||
this.publicationEditionService.displayPictureSectionDialog();
|
this.publicationEditionService.displayPictureSectionDialog();
|
||||||
}
|
}
|
||||||
@@ -138,10 +185,6 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
save(): void {
|
|
||||||
this.publicationSave.emit(this.publicationEditionService.editedPublication);
|
|
||||||
}
|
|
||||||
|
|
||||||
onTabChange(tabSelectedIndex: number): void {
|
onTabChange(tabSelectedIndex: number): void {
|
||||||
if (tabSelectedIndex === 1) {
|
if (tabSelectedIndex === 1) {
|
||||||
this.publicationEditionService.loadPreview();
|
this.publicationEditionService.loadPreview();
|
||||||
|
|||||||
@@ -3,14 +3,13 @@ import { inject, Injectable, OnDestroy } from "@angular/core";
|
|||||||
import { MatDialog } from "@angular/material/dialog";
|
import { MatDialog } from "@angular/material/dialog";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
import { ActivatedRoute } from "@angular/router";
|
import { ActivatedRoute } from "@angular/router";
|
||||||
import { BehaviorSubject, debounceTime, distinctUntilChanged, Observable, Subscription } from "rxjs";
|
import { BehaviorSubject, Observable, Subscription } from "rxjs";
|
||||||
import { Publication } from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
import { copy } from "../../core/utils/ObjectUtils";
|
import { copy } from "../../core/utils/ObjectUtils";
|
||||||
import { CodeBlockDialog } from "./code-block-dialog/code-block-dialog.component";
|
import { CodeBlockDialog } from "./code-block-dialog/code-block-dialog.component";
|
||||||
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
|
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
|
||||||
import { PreviewContentRequest } from "../../core/rest-services/publications/model/preview";
|
import { PreviewContentRequest } from "../../core/rest-services/publications/model/preview";
|
||||||
import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
|
|
||||||
|
|
||||||
declare let Prism: any;
|
declare let Prism: any;
|
||||||
|
|
||||||
@@ -58,11 +57,10 @@ const DEFAULT_STATE: PublicationEditionState = {
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class PublicationEditionService implements OnDestroy {
|
export class PublicationEditionService implements OnDestroy {
|
||||||
private readonly activatedRoute = inject(ActivatedRoute);
|
private readonly activatedRoute = inject(ActivatedRoute);
|
||||||
private readonly dialog = inject(MatDialog);
|
|
||||||
private readonly formBuilder = inject(FormBuilder);
|
|
||||||
private readonly location = inject(Location);
|
|
||||||
private readonly publicationRestService = inject(PublicationRestService);
|
private readonly publicationRestService = inject(PublicationRestService);
|
||||||
|
private readonly location = inject(Location);
|
||||||
private readonly snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
|
private readonly dialog = inject(MatDialog);
|
||||||
|
|
||||||
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
private stateSubject = new BehaviorSubject<PublicationEditionState>(copy(DEFAULT_STATE));
|
private stateSubject = new BehaviorSubject<PublicationEditionState>(copy(DEFAULT_STATE));
|
||||||
@@ -70,14 +68,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
private isSavingSubject = new BehaviorSubject<boolean>(false);
|
private isSavingSubject = new BehaviorSubject<boolean>(false);
|
||||||
private isPreviewingSubject = new BehaviorSubject<boolean>(false);
|
private isPreviewingSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
|
||||||
publicationEditionForm: FormGroup = this.formBuilder.group({
|
|
||||||
title: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
description: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
text: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
illustrationId: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
categoryId: new FormControl<string | undefined>('', [Validators.required])
|
|
||||||
});
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
ngOnDestroy(): void {
|
||||||
this.subscriptions.forEach(subscription => subscription.unsubscribe());
|
this.subscriptions.forEach(subscription => subscription.unsubscribe());
|
||||||
}
|
}
|
||||||
@@ -90,17 +80,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
this.stateSubject.next(state);
|
this.stateSubject.next(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _updateForm(): void {
|
|
||||||
const state = this._state;
|
|
||||||
const publication = state.publication;
|
|
||||||
|
|
||||||
this.publicationEditionForm.controls['title'].setValue(publication.title);
|
|
||||||
this.publicationEditionForm.controls['description'].setValue(publication.description);
|
|
||||||
this.publicationEditionForm.controls['text'].setValue(publication.text);
|
|
||||||
this.publicationEditionForm.controls['illustrationId'].setValue(publication.illustrationId);
|
|
||||||
this.publicationEditionForm.controls['categoryId'].setValue(publication.categoryId);
|
|
||||||
}
|
|
||||||
|
|
||||||
get isLoading$(): Observable<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.isLoadingSubject.asObservable();
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
@@ -117,10 +96,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
return this.stateSubject.asObservable();
|
return this.stateSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get editedPublication(): Publication {
|
|
||||||
return this._state.publication;
|
|
||||||
}
|
|
||||||
|
|
||||||
loadPublication(): void {
|
loadPublication(): void {
|
||||||
this.isLoadingSubject.next(true);
|
this.isLoadingSubject.next(true);
|
||||||
|
|
||||||
@@ -131,47 +106,52 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
this.location.back();
|
this.location.back();
|
||||||
} else {
|
} else {
|
||||||
this.publicationRestService.getById(publicationId)
|
this.publicationRestService.getById(publicationId)
|
||||||
.then(publication => {
|
.then(publication => {
|
||||||
const state = this._state;
|
const state = this._state;
|
||||||
state.publication = publication;
|
state.publication = publication;
|
||||||
this.stateSubject.next(state);
|
this.stateSubject.next(state);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
||||||
this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
||||||
console.error(errorMessage, error)
|
console.error(errorMessage, error)
|
||||||
})
|
})
|
||||||
.finally(() => this.isLoadingSubject.next(false));
|
.finally(() => this.isLoadingSubject.next(false));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
init(publication: Publication): void {
|
init(publication: Publication): void {
|
||||||
const state = this._state;
|
const state = this._state;
|
||||||
state.publication = publication;
|
state.publication = publication;
|
||||||
this.stateSubject.next(state);
|
this.stateSubject.next(state);
|
||||||
this._updateForm();
|
|
||||||
|
|
||||||
const formValueChangesSubscription = this.publicationEditionForm.valueChanges
|
|
||||||
.pipe(
|
|
||||||
debounceTime(200),
|
|
||||||
distinctUntilChanged()
|
|
||||||
)
|
|
||||||
.subscribe(formValue => {
|
|
||||||
const state = this._state;
|
|
||||||
const publication = state.publication;
|
|
||||||
|
|
||||||
publication.title = formValue.title;
|
|
||||||
publication.description = formValue.description;
|
|
||||||
publication.categoryId = formValue.categoryId;
|
|
||||||
publication.text = formValue.text;
|
|
||||||
|
|
||||||
this._save(state);
|
|
||||||
})
|
|
||||||
this.subscriptions.push(formValueChangesSubscription);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private editIllustrationId(pictureId: string): void {
|
editTitle(title: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.title = title;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editDescription(description: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.description = description;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editCategoryId(categoryId: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.categoryId = categoryId;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editText(text: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.text = text;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editIllustrationId(pictureId: string): void {
|
||||||
const state = this._state;
|
const state = this._state;
|
||||||
state.publication.illustrationId = pictureId
|
state.publication.illustrationId = pictureId
|
||||||
this._save(state);
|
this._save(state);
|
||||||
@@ -224,7 +204,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this._save(state);
|
this._save(state);
|
||||||
this._updateForm();
|
|
||||||
} else {
|
} else {
|
||||||
console.error(`Bad value for parameter of function 'insertTitle': '${titleNumber}'.`);
|
console.error(`Bad value for parameter of function 'insertTitle': '${titleNumber}'.`);
|
||||||
}
|
}
|
||||||
@@ -254,7 +233,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this._save(state);
|
this._save(state);
|
||||||
this._updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
insertLink(): void {
|
insertLink(): void {
|
||||||
@@ -270,10 +248,9 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this._save(state);
|
this._save(state);
|
||||||
this._updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private insertCodeBlock(programmingLanguage: string, codeBlock: string): void {
|
insertCodeBlock(programmingLanguage: string, codeBlock: string): void {
|
||||||
const state = this._state;
|
const state = this._state;
|
||||||
|
|
||||||
const publication = state.publication;
|
const publication = state.publication;
|
||||||
@@ -286,7 +263,6 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this._save(state);
|
this._save(state);
|
||||||
this._updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loadPreview(): void {
|
loadPreview(): void {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="close()"
|
(click)="close()"
|
||||||
class="cod-button icon"
|
class="cod-btn icon"
|
||||||
matTooltip="Close the menu"
|
matTooltip="Close the menu"
|
||||||
matRipple
|
matRipple
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<button type="submit"
|
<button type="submit"
|
||||||
class="cod-button {{color}}"
|
class="cod-btn {{color}}"
|
||||||
[disabled]="disabled || requestPending"
|
[disabled]="disabled || requestPending"
|
||||||
(click)="click.emit()"
|
(click)="click.emit()"
|
||||||
matRipple>
|
matRipple>
|
||||||
|
|||||||
@@ -18,6 +18,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions reversed">
|
||||||
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
||||||
<a [routerLink]="['/signin']" class="cod-button secondary" matRipple i18n>Create an account</a>
|
<a [routerLink]="['/signin']" class="cod-btn secondary" matRipple i18n>Create an account</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -34,6 +34,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions reversed">
|
||||||
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
||||||
<a [routerLink]="['/login']" class="cod-button secondary" matRipple i18n>I already have an account</a>
|
<a [routerLink]="['/login']" class="cod-btn secondary" matRipple i18n>I already have an account</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
button.cod-button, a.cod-button {
|
button.cod-btn, a.cod-btn {
|
||||||
padding: .8em 1.2em;
|
padding: .8em 1.2em;
|
||||||
border-radius: 10em;
|
border-radius: 10em;
|
||||||
border: none;
|
border: none;
|
||||||
@@ -38,6 +38,6 @@ button.cod-button, a.cod-button {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a.cod-button {
|
a.cod-btn {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
"translations": {
|
"translations": {
|
||||||
"3603720768157919481": "Non",
|
"3603720768157919481": "Non",
|
||||||
"4861926948802653243": "Oui",
|
"4861926948802653243": "Oui",
|
||||||
"6130235414952256120": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 Tous droits réservés - 2.1 {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
"5277292207846698726": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 Tous droits réservés - 2.0-alpha {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
||||||
"9214089025589249203": "Les indicateurs de vie du site seront disponibles ultérieurement...",
|
"9214089025589249203": "Les indicateurs de vie du site seront disponibles ultérieurement...",
|
||||||
"1711651175531679766": "La documentation sera disponible ultérieurement...",
|
"1711651175531679766": "La documentation sera disponible ultérieurement...",
|
||||||
"6299155290121808295": "Développements realisés par",
|
"6299155290121808295": "Développements realisés par",
|
||||||
@@ -11,7 +11,6 @@
|
|||||||
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} Mes publications",
|
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} Mes publications",
|
||||||
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Déconnexion",
|
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Déconnexion",
|
||||||
"2454050363478003966": "Connexion",
|
"2454050363478003966": "Connexion",
|
||||||
"7819314041543176992": "Fermer",
|
|
||||||
"6379828571327118783": "Ajouter un bloc de code",
|
"6379828571327118783": "Ajouter un bloc de code",
|
||||||
"933522671092765466": "Langage de programmation",
|
"933522671092765466": "Langage de programmation",
|
||||||
"5953425146193292178": "Bloc de code",
|
"5953425146193292178": "Bloc de code",
|
||||||
@@ -23,6 +22,7 @@
|
|||||||
"4491342806775118195": "Il n'y a aucune image.",
|
"4491342806775118195": "Il n'y a aucune image.",
|
||||||
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Ajouter une nouvelle image",
|
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Ajouter une nouvelle image",
|
||||||
"6852365376059142995": "Une erreur est survenue lors du chargements de vos images.",
|
"6852365376059142995": "Une erreur est survenue lors du chargements de vos images.",
|
||||||
|
"7819314041543176992": "Fermer",
|
||||||
"6198966268398913224": "Une erreur technique est survenue lors de l'ajout de votre image.",
|
"6198966268398913224": "Une erreur technique est survenue lors de l'ajout de votre image.",
|
||||||
"3603937053948195893": "Édition",
|
"3603937053948195893": "Édition",
|
||||||
"5701618810648052610": "Titre",
|
"5701618810648052610": "Titre",
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
"382530603854484923": "Cliquez pour ajouter une section titre de niveau 1",
|
"382530603854484923": "Cliquez pour ajouter une section titre de niveau 1",
|
||||||
"7918008528690631661": "Cliquez pour ajouter une section titre de niveau 2",
|
"7918008528690631661": "Cliquez pour ajouter une section titre de niveau 2",
|
||||||
"200884310255063303": "Cliquez pour ajouter une section titre de niveau 3",
|
"200884310255063303": "Cliquez pour ajouter une section titre de niveau 3",
|
||||||
"2615926469669796978": "Cliquez pour ajouter un lien",
|
|
||||||
"327371240590280003": "Cliquez pour ajouter une image",
|
"327371240590280003": "Cliquez pour ajouter une image",
|
||||||
|
"2615926469669796978": "Cliquez pour ajouter un lien",
|
||||||
"4689637499823680515": "Cliquez pour ajouter un bloc de code",
|
"4689637499823680515": "Cliquez pour ajouter un bloc de code",
|
||||||
"1065684538660053227": "Cliquez pour afficher l'aide",
|
"1065684538660053227": "Cliquez pour afficher l'aide",
|
||||||
"6205355627445317276": "Contenu",
|
"6205355627445317276": "Contenu",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"translations": {
|
"translations": {
|
||||||
"3603720768157919481": " No ",
|
"3603720768157919481": " No ",
|
||||||
"4861926948802653243": " Yes ",
|
"4861926948802653243": " Yes ",
|
||||||
"6130235414952256120": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 All rights reserved - 2.1 {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
"5277292207846698726": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 All rights reserved - 2.0-alpha {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
||||||
"9214089025589249203": "Health checking will be available in future...",
|
"9214089025589249203": "Health checking will be available in future...",
|
||||||
"1711651175531679766": "Documentation will be available in future...",
|
"1711651175531679766": "Documentation will be available in future...",
|
||||||
"6299155290121808295": "Development realised by",
|
"6299155290121808295": "Development realised by",
|
||||||
@@ -11,7 +11,6 @@
|
|||||||
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} My publications ",
|
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} My publications ",
|
||||||
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Disconnect ",
|
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Disconnect ",
|
||||||
"2454050363478003966": "Login",
|
"2454050363478003966": "Login",
|
||||||
"7819314041543176992": "Close",
|
|
||||||
"6379828571327118783": "Add a code block",
|
"6379828571327118783": "Add a code block",
|
||||||
"933522671092765466": "Programming language",
|
"933522671092765466": "Programming language",
|
||||||
"5953425146193292178": "Code block",
|
"5953425146193292178": "Code block",
|
||||||
@@ -23,6 +22,7 @@
|
|||||||
"4491342806775118195": "There is no any picture.",
|
"4491342806775118195": "There is no any picture.",
|
||||||
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Add new picture ",
|
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Add new picture ",
|
||||||
"6852365376059142995": "An error occured while loading pictures.",
|
"6852365376059142995": "An error occured while loading pictures.",
|
||||||
|
"7819314041543176992": "Close",
|
||||||
"6198966268398913224": "A technical error occured while uploading your picture.",
|
"6198966268398913224": "A technical error occured while uploading your picture.",
|
||||||
"3603937053948195893": "Edition",
|
"3603937053948195893": "Edition",
|
||||||
"5701618810648052610": "Title",
|
"5701618810648052610": "Title",
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
"382530603854484923": "Click to insert a title 1 section",
|
"382530603854484923": "Click to insert a title 1 section",
|
||||||
"7918008528690631661": "Click to insert a title 2 section",
|
"7918008528690631661": "Click to insert a title 2 section",
|
||||||
"200884310255063303": "Click to insert a title 3 section",
|
"200884310255063303": "Click to insert a title 3 section",
|
||||||
"2615926469669796978": "Click to insert a link",
|
|
||||||
"327371240590280003": "Click to insert a picture",
|
"327371240590280003": "Click to insert a picture",
|
||||||
|
"2615926469669796978": "Click to insert a link",
|
||||||
"4689637499823680515": "Click to insert a code block",
|
"4689637499823680515": "Click to insert a code block",
|
||||||
"1065684538660053227": "Click to display editor help",
|
"1065684538660053227": "Click to display editor help",
|
||||||
"6205355627445317276": "Content",
|
"6205355627445317276": "Content",
|
||||||
|
|||||||
Reference in New Issue
Block a user