🚧 #80 Added gif, resolve #86, Wip #85

* Change some icons

pom.xml

@@ -12,6 +12,7 @@
     <properties>
         <java.version>21</java.version>
         <vaadin.version>24.5.4</vaadin.version>
+        <org.projectlombok.version>1.18.32</org.projectlombok.version>
     </properties>
 
     <parent>
@@ -121,6 +122,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${org.projectlombok.version}</version>
         </dependency>
 
         <dependency>
@@ -198,6 +200,17 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>21</source> <!-- depending on your project -->
+                    <target>21</target> <!-- depending on your project -->
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 

src/main/frontend/themes/espflow/styles.css

@@ -6,6 +6,7 @@
 //@import url('components/border.css');*/
 @import url('components/layout.css');
 @import url('./views/readflash/esp-device-info.css');
+@import url('./views/flash-view/wizard-dialog/wizard-dialog.css');
 @import url('./views/settings-dialog/settings-dialog.css');
 @import url('./fonts/stylesheet.css');
 

src/main/frontend/themes/espflow/views/flash-view/wizard-dialog/wizard-dialog.css

@@ -0,0 +1,10 @@
+.avatar-step-inactive {
+    color: black;
+    border: 1px solid black;
+    background-color: white;
+}
+
+.avatar-step-active {
+    background: var(--lumo-primary-color);
+    color: var(--lumo-primary-contrast-color);
+}

src/main/java/com/esp/espflow/configuration/EspMessageListItemReactivePublisher.java

@@ -1,6 +1,6 @@
 package com.esp.espflow.configuration;
 
-import com.vaadin.flow.component.messages.MessageListItem;
+import com.esp.espflow.entity.event.EspMessageListItemEvent;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import reactor.core.publisher.Flux;
@@ -17,15 +17,15 @@
 public class EspMessageListItemReactivePublisher {
 
     @Bean(value = "publishMessageListItem")
-    public Sinks.Many<MessageListItem> publisher() {
+    public Sinks.Many<EspMessageListItemEvent> publisher() {
         return Sinks
                 .many()
                 .multicast()
                 .onBackpressureBuffer();
     }
 
     @Bean(value = "subscribersMessageListItems")
-    public Flux<MessageListItem> subscribers(Sinks.Many<MessageListItem> publisher) {
+    public Flux<EspMessageListItemEvent> subscribers(Sinks.Many<EspMessageListItemEvent> publisher) {
         return publisher
                 .asFlux();
     }

src/main/java/com/esp/espflow/entity/WizardEspEntity.java

@@ -0,0 +1,22 @@
+package com.esp.espflow.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "wizard_flashesp")
+public class WizardEspEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private boolean isWizardEnabled;
+    private String name;
+
+}

src/main/java/com/esp/espflow/entity/dto/WizardEspDto.java

@@ -0,0 +1,9 @@
+package com.esp.espflow.entity.dto;
+
+import lombok.Builder;
+
+/**
+ * @author rub'n
+ */
+@Builder
+public record WizardEspDto(boolean isWizardEnabled, String name) {}

src/main/java/com/esp/espflow/entity/event/DialogHideEvent.java

@@ -0,0 +1,5 @@
+package com.esp.espflow.entity.event;
+
+public enum DialogHideEvent {
+    HIDE
+}

src/main/java/com/esp/espflow/entity/event/EspMessageListItemEvent.java

@@ -0,0 +1,40 @@
+package com.esp.espflow.entity.event;
+
+import com.esp.espflow.util.svgfactory.SvgFactory;
+import com.vaadin.flow.component.messages.MessageListItem;
+import com.vaadin.flow.server.StreamResource;
+import lombok.extern.log4j.Log4j2;
+
+import java.security.SecureRandom;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Arrays;
+
+import static com.esp.espflow.util.EspFlowConstants.FRONTEND_IMAGES_SVG_ICONS;
+
+/**
+ * @author rub'n
+ */
+@Log4j2
+public class EspMessageListItemEvent extends MessageListItem {
+    /*
+     * For Custom colors
+     */
+    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+
+    public EspMessageListItemEvent(String operation, String port) {
+        super.setText(operation);
+        super.setTime(LocalDateTime.now().toInstant(ZoneOffset.UTC));
+        super.setUserName(port);
+        this.setCustomImage();
+        var colors = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
+        super.setUserColorIndex(colors.get(SECURE_RANDOM.nextInt(colors.size())));
+    }
+
+    private void setCustomImage() {
+        final StreamResource resource = new StreamResource("usb-port-black.svg",
+                () -> SvgFactory.class.getResourceAsStream(FRONTEND_IMAGES_SVG_ICONS + "usb-port-black.svg"));
+        super.setUserImageResource(resource);
+    }
+
+}

src/main/java/com/esp/espflow/generator/DataGenerator.java

@@ -2,7 +2,7 @@
 
 import com.esp.espflow.entity.User;
 import com.esp.espflow.enums.Role;
-import com.esp.espflow.service.UserRepository;
+import com.esp.espflow.service.respository.UserRepository;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/esp/espflow/mappers/WizardEspMapper.java

@@ -0,0 +1,29 @@
+package com.esp.espflow.mappers;
+
+import com.esp.espflow.entity.WizardEspEntity;
+import com.esp.espflow.entity.dto.WizardEspDto;
+
+/**
+ * @author rub'n
+ */
+public class WizardEspMapper {
+
+    public static final WizardEspMapper INSTANCE = new WizardEspMapper();
+
+    private WizardEspMapper() {
+    }
+
+    public WizardEspEntity dtoToEntity(final WizardEspDto dto) {
+        final WizardEspEntity entity = new WizardEspEntity();
+        entity.setName(dto.name());
+        entity.setWizardEnabled(dto.isWizardEnabled());
+        return entity;
+    }
+
+    public WizardEspDto entityToDto(final WizardEspEntity entity) {
+        return WizardEspDto.builder()
+                .name(entity.getName())
+                .isWizardEnabled(entity.isWizardEnabled())
+                .build();
+    }
+}

src/main/java/com/esp/espflow/security/AuthenticatedUser.java

@@ -1,7 +1,7 @@
 package com.esp.espflow.security;
 
 import com.esp.espflow.entity.User;
-import com.esp.espflow.service.UserRepository;
+import com.esp.espflow.service.respository.UserRepository;
 import com.vaadin.flow.spring.security.AuthenticationContext;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;

src/main/java/com/esp/espflow/security/UserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.esp.espflow.security;
 
 import com.esp.espflow.entity.User;
-import com.esp.espflow.service.UserRepository;
+import com.esp.espflow.service.respository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

src/main/java/com/esp/espflow/service/UserService.java

@@ -1,6 +1,7 @@
 package com.esp.espflow.service;
 
 import com.esp.espflow.entity.User;
+import com.esp.espflow.service.respository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/esp/espflow/service/UserRepository.java → src/main/java/com/esp/espflow/service/respository/UserRepository.java

@@ -1,4 +1,4 @@
-package com.esp.espflow.service;
+package com.esp.espflow.service.respository;
 
 
 import com.esp.espflow.entity.User;

src/main/java/com/esp/espflow/service/respository/WizardEspRepository.java

@@ -0,0 +1,14 @@
+package com.esp.espflow.service.respository;
+
+import com.esp.espflow.entity.WizardEspEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface WizardEspRepository extends JpaRepository<WizardEspEntity, Long> {
+
+    Optional<WizardEspEntity> findByName(String name);
+
+}

src/main/java/com/esp/espflow/service/respository/impl/WizardEspService.java

@@ -0,0 +1,52 @@
+package com.esp.espflow.service.respository.impl;
+
+import com.esp.espflow.entity.WizardEspEntity;
+import com.esp.espflow.entity.dto.WizardEspDto;
+import com.esp.espflow.mappers.WizardEspMapper;
+import com.esp.espflow.service.respository.WizardEspRepository;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @author rub'n
+ */
+@Log4j2
+@Service
+@RequiredArgsConstructor
+public class WizardEspService {
+
+    private final WizardEspRepository wizardEspRepository;
+
+    /**
+     * @param wizardEspDto
+     */
+    public void save(WizardEspDto wizardEspDto) {
+        var entity = WizardEspMapper.INSTANCE.dtoToEntity(wizardEspDto);
+        this.wizardEspRepository.findByName(entity.getName())
+                .ifPresentOrElse(currentEntity -> {
+                    currentEntity.setWizardEnabled(entity.isWizardEnabled());
+                    wizardEspRepository.save(currentEntity);
+                    log.info("Entity updated {}", currentEntity);
+                }, () -> {
+                    wizardEspRepository.save(entity);
+                    log.info("Entity saved {}", entity);
+                });
+    }
+
+    /**
+     *
+     * @param name of this Wizard
+     *
+     * @return A {@link Optional< WizardEspEntity >}
+     */
+    @Transactional
+    public Optional<WizardEspDto> findWizardFlashEsp(String name) {
+        return this.wizardEspRepository.findByName(name)
+                .map(WizardEspMapper.INSTANCE::entityToDto);
+    }
+
+}

src/main/java/com/esp/espflow/util/EspFlowConstants.java

@@ -50,7 +50,7 @@ public class EspFlowConstants {
     public static final String DIALOG_DISABLED = "Hide";
     public static final String INFORMATION = "Information";
     public static final String WARNING = "Warning";
-
+    public static final String FRONTEND_ICON = "icons/icon.png";
     public static final String FRONTEND_IMAGES_ESPDEVICES = "frontend/images/espdevices/";
     public static final String FRONTEND_IMAGES_LOGO = "frontend/images/logo/";
     public static final String FRONTEND_IMAGES_AVATAR_USER = "frontend/images/avatar-user/";
@@ -92,4 +92,9 @@ public class EspFlowConstants {
     public static final String MACOS_ICON = "mac.svg";
     public static final String FREE_BSD_ICON = "freebsd.svg";
     public static final String NO_OS_ICON = "no-os.svg";
+    public static final String ESPFLOW_SOURCE_CODE = "https://github.com/rucko24/EspFlow";
+    public static final String WIZARD_FLASHESP_VIEW = "wizardFlashEspView";
+    public static final String WIZARD_READ_FLASH_ESP_VIEW = "wizardReadFlashEspView";
+    public static final String INNER_HTML = "innerHTML";
+
 }