diff --git a/sweater-FileUpload/.classpath b/.classpath similarity index 100% rename from sweater-FileUpload/.classpath rename to .classpath diff --git a/sweater-FileUpload/.gitignore b/.gitignore similarity index 100% rename from sweater-FileUpload/.gitignore rename to .gitignore diff --git a/sweater-FileUpload/.project b/.project similarity index 100% rename from sweater-FileUpload/.project rename to .project diff --git a/sweater-FileUpload/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/sweater-FileUpload/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/sweater-FileUpload/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.m2e.core.prefs rename to .settings/org.eclipse.m2e.core.prefs diff --git a/sweater-FileUpload/.settings/org.springframework.ide.eclipse.prefs b/.settings/org.springframework.ide.eclipse.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.springframework.ide.eclipse.prefs rename to .settings/org.springframework.ide.eclipse.prefs diff --git a/sweater-FileUpload/README.md b/README.md similarity index 100% rename from sweater-FileUpload/README.md rename to README.md diff --git a/sweater-FileUpload/pom.xml b/pom.xml similarity index 86% rename from sweater-FileUpload/pom.xml rename to pom.xml index c59c6f0..a3556f7 100644 --- a/sweater-FileUpload/pom.xml +++ b/pom.xml @@ -87,29 +87,15 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - - - junit - junit - 4.12 - test - - - org.junit.jupiter - junit-jupiter - RELEASE + com.h2database + h2 + 1.4.194 test - @@ -118,7 +104,6 @@ 1.8 - diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/Application.java b/src/main/java/com/example/sweater/Application.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/Application.java rename to src/main/java/com/example/sweater/Application.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/MailConfig.java b/src/main/java/com/example/sweater/config/MailConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/MailConfig.java rename to src/main/java/com/example/sweater/config/MailConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/MvcConfig.java b/src/main/java/com/example/sweater/config/MvcConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/MvcConfig.java rename to src/main/java/com/example/sweater/config/MvcConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/WebSecurityConfig.java b/src/main/java/com/example/sweater/config/WebSecurityConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/WebSecurityConfig.java rename to src/main/java/com/example/sweater/config/WebSecurityConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/ControllerUtils.java b/src/main/java/com/example/sweater/controller/ControllerUtils.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/ControllerUtils.java rename to src/main/java/com/example/sweater/controller/ControllerUtils.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/MainController.java b/src/main/java/com/example/sweater/controller/MainController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/MainController.java rename to src/main/java/com/example/sweater/controller/MainController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/RegistrationController.java b/src/main/java/com/example/sweater/controller/RegistrationController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/RegistrationController.java rename to src/main/java/com/example/sweater/controller/RegistrationController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/UserController.java b/src/main/java/com/example/sweater/controller/UserController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/UserController.java rename to src/main/java/com/example/sweater/controller/UserController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/Message.java b/src/main/java/com/example/sweater/domain/Message.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/Message.java rename to src/main/java/com/example/sweater/domain/Message.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/Role.java b/src/main/java/com/example/sweater/domain/Role.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/Role.java rename to src/main/java/com/example/sweater/domain/Role.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/User.java b/src/main/java/com/example/sweater/domain/User.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/User.java rename to src/main/java/com/example/sweater/domain/User.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java b/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java rename to src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/repos/MessageRepo.java b/src/main/java/com/example/sweater/repos/MessageRepo.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/repos/MessageRepo.java rename to src/main/java/com/example/sweater/repos/MessageRepo.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/repos/UserRepo.java b/src/main/java/com/example/sweater/repos/UserRepo.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/repos/UserRepo.java rename to src/main/java/com/example/sweater/repos/UserRepo.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/service/MailSender.java b/src/main/java/com/example/sweater/service/MailSender.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/service/MailSender.java rename to src/main/java/com/example/sweater/service/MailSender.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/service/UserSevice.java b/src/main/java/com/example/sweater/service/UserSevice.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/service/UserSevice.java rename to src/main/java/com/example/sweater/service/UserSevice.java diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..21a25d4 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,13 @@ +spring.profiles.active: test + +spring: + jpa: + database: h2 + hibernate: + ddl-auto: create + datasource: + url: jdbc:h2:mem:AZ + driver-class-name: org.h2.Driver + h2: + console: + enabled: true \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..52eeb73 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,31 @@ +mail: + debug: true + properties: + mail: + smtp: + auth: true + smtp: + starttls: + enable: true +recaptcha: + secret: 6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT +spring: + datasource: + password: 770 + url: jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false + username: root + jpa: + generate-ddl: false + hibernate: + ddl-auto: validate + show-sql: false + mail: + host: smtp.gmail.com + password: Waweqtt541 + port: 587 + protocol: smtp + username: oleksandr.kaplin@nure.ua + mustache: + expose-request-attributes: true +upload: + path: C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads diff --git a/sweater-FileUpload/src/main/resources/db/migration/V1__Init_DB.sql b/src/main/resources/db/migration/V1__Init_DB.sql similarity index 100% rename from sweater-FileUpload/src/main/resources/db/migration/V1__Init_DB.sql rename to src/main/resources/db/migration/V1__Init_DB.sql diff --git a/sweater-FileUpload/src/main/resources/static/style.css b/src/main/resources/static/style.css similarity index 100% rename from sweater-FileUpload/src/main/resources/static/style.css rename to src/main/resources/static/style.css diff --git a/sweater-FileUpload/src/main/resources/templates/greeting.ftl b/src/main/resources/templates/greeting.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/greeting.ftl rename to src/main/resources/templates/greeting.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/login.ftl rename to src/main/resources/templates/login.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/main.ftl b/src/main/resources/templates/main.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/main.ftl rename to src/main/resources/templates/main.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/common.ftl b/src/main/resources/templates/parts/common.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/common.ftl rename to src/main/resources/templates/parts/common.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/login.ftl b/src/main/resources/templates/parts/login.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/login.ftl rename to src/main/resources/templates/parts/login.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/navbar.ftl b/src/main/resources/templates/parts/navbar.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/navbar.ftl rename to src/main/resources/templates/parts/navbar.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/security.ftl b/src/main/resources/templates/parts/security.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/security.ftl rename to src/main/resources/templates/parts/security.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/profile.ftl b/src/main/resources/templates/profile.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/profile.ftl rename to src/main/resources/templates/profile.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/registration.ftl b/src/main/resources/templates/registration.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/registration.ftl rename to src/main/resources/templates/registration.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/userEdit.ftl b/src/main/resources/templates/userEdit.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/userEdit.ftl rename to src/main/resources/templates/userEdit.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/userList.ftl b/src/main/resources/templates/userList.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/userList.ftl rename to src/main/resources/templates/userList.ftl diff --git a/src/test/java/com/example/sweater/MockMvcExampleTests.java b/src/test/java/com/example/sweater/MockMvcExampleTests.java new file mode 100644 index 0000000..7a9322e --- /dev/null +++ b/src/test/java/com/example/sweater/MockMvcExampleTests.java @@ -0,0 +1,34 @@ +package com.example.sweater; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("test") +public class MockMvcExampleTests { + + @LocalServerPort + private int port; + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void contextLoads() throws Exception { + } + + @Test + public void greetingShouldReturnDefaultMessage() throws Exception { + assertThat(this.restTemplate.getForObject("http://localhost:" + port + "/", + String.class)).contains("Hello World"); + } +} diff --git a/sweater-FileUpload/src/main/resources/application.properties b/sweater-FileUpload/src/main/resources/application.properties deleted file mode 100644 index c4070d7..0000000 --- a/sweater-FileUpload/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false -spring.datasource.username=root -spring.datasource.password=0770 -spring.jpa.generate-ddl=false -spring.mustache.expose-request-attributes=true -spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=validate - -upload.path=C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads -spring.mail.host=smtp.gmail.com -spring.mail.username=oleksandr.kaplin@nure.ua -spring.mail.password=Waweqtt541 -spring.mail.port=587 -mail.properties.mail.smtp.auth=true -spring.mail.protocol=smtp -mail.debug=true -mail.smtp.starttls.enable=true - -recaptcha.secret=6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT - diff --git a/sweater-FileUpload/src/test/java/com/example/sweater/MockMvcLoginPageTests.java b/sweater-FileUpload/src/test/java/com/example/sweater/MockMvcLoginPageTests.java deleted file mode 100644 index bcc90c8..0000000 --- a/sweater-FileUpload/src/test/java/com/example/sweater/MockMvcLoginPageTests.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.sweater; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.test.web.servlet.MockMvc; - - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@SpringBootTest -@AutoConfigureMockMvc -class MockMvcExampleTests { - - @Test - void exampleTest(@Autowired WebTestClient webClient){ - webClient.get().uri("/login").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("login.ftl"); - } -} diff --git a/sweater-FileUpload/target/classes/application.properties b/sweater-FileUpload/target/classes/application.properties deleted file mode 100644 index c4070d7..0000000 --- a/sweater-FileUpload/target/classes/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false -spring.datasource.username=root -spring.datasource.password=0770 -spring.jpa.generate-ddl=false -spring.mustache.expose-request-attributes=true -spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=validate - -upload.path=C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads -spring.mail.host=smtp.gmail.com -spring.mail.username=oleksandr.kaplin@nure.ua -spring.mail.password=Waweqtt541 -spring.mail.port=587 -mail.properties.mail.smtp.auth=true -spring.mail.protocol=smtp -mail.debug=true -mail.smtp.starttls.enable=true - -recaptcha.secret=6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT - diff --git a/sweater-FileUpload/target/classes/com/example/sweater/Application.class b/sweater-FileUpload/target/classes/com/example/sweater/Application.class deleted file mode 100644 index 61aa21c..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/Application.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/MailConfig.class b/sweater-FileUpload/target/classes/com/example/sweater/config/MailConfig.class deleted file mode 100644 index 218540e..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/config/MailConfig.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/MvcConfig.class b/sweater-FileUpload/target/classes/com/example/sweater/config/MvcConfig.class deleted file mode 100644 index 179ff5c..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/config/MvcConfig.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/WebSecurityConfig.class b/sweater-FileUpload/target/classes/com/example/sweater/config/WebSecurityConfig.class deleted file mode 100644 index 9d057ef..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/config/WebSecurityConfig.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/ControllerUtils.class b/sweater-FileUpload/target/classes/com/example/sweater/controller/ControllerUtils.class deleted file mode 100644 index f0b3d05..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/controller/ControllerUtils.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/MainController.class b/sweater-FileUpload/target/classes/com/example/sweater/controller/MainController.class deleted file mode 100644 index 5e9cd08..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/controller/MainController.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/RegistrationController.class b/sweater-FileUpload/target/classes/com/example/sweater/controller/RegistrationController.class deleted file mode 100644 index 6693c89..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/controller/RegistrationController.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/UserController.class b/sweater-FileUpload/target/classes/com/example/sweater/controller/UserController.class deleted file mode 100644 index d2bd538..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/controller/UserController.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/Message.class b/sweater-FileUpload/target/classes/com/example/sweater/domain/Message.class deleted file mode 100644 index 6718870..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/domain/Message.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/Role.class b/sweater-FileUpload/target/classes/com/example/sweater/domain/Role.class deleted file mode 100644 index 1b54a89..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/domain/Role.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/User.class b/sweater-FileUpload/target/classes/com/example/sweater/domain/User.class deleted file mode 100644 index 101107e..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/domain/User.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class b/sweater-FileUpload/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class deleted file mode 100644 index 9eca149..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/repos/MessageRepo.class b/sweater-FileUpload/target/classes/com/example/sweater/repos/MessageRepo.class deleted file mode 100644 index 2dcccac..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/repos/MessageRepo.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/repos/UserRepo.class b/sweater-FileUpload/target/classes/com/example/sweater/repos/UserRepo.class deleted file mode 100644 index 203dc8b..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/repos/UserRepo.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/service/MailSender.class b/sweater-FileUpload/target/classes/com/example/sweater/service/MailSender.class deleted file mode 100644 index c69bf2e..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/service/MailSender.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/com/example/sweater/service/UserSevice.class b/sweater-FileUpload/target/classes/com/example/sweater/service/UserSevice.class deleted file mode 100644 index 0f9981a..0000000 Binary files a/sweater-FileUpload/target/classes/com/example/sweater/service/UserSevice.class and /dev/null differ diff --git a/sweater-FileUpload/target/classes/db/migration/V1__Init_DB.sql b/sweater-FileUpload/target/classes/db/migration/V1__Init_DB.sql deleted file mode 100644 index 25eb1a2..0000000 --- a/sweater-FileUpload/target/classes/db/migration/V1__Init_DB.sql +++ /dev/null @@ -1,29 +0,0 @@ - -create table hibernate_sequence (next_val bigint) engine=MyISAM; -insert into hibernate_sequence (next_val) values ( 1 ); -insert into hibernate_sequence (next_val) values( 1 ); - -create table message ( - id integer not null, - filename varchar(255), - rating_value varchar(255), - tag varchar(255), - text varchar(255), - user_id bigint, - primary key (id)) engine=MyISAM; - -create table user_role ( - user_id bigint not null, - roles varchar(255)) engine=MyISAM; - -create table usr( - id bigint not null, - activation_code varchar(255), - active bit not null, - email varchar(255), - password varchar(255), - username varchar(255), - primary key (id)) engine=MyISAM; - -alter table message add constraint FK70bv6o4exfe3fbrho7nuotopf foreign key (user_id) references usr (id); -alter table user_role add constraint FKfpm8swft53ulq2hl11yplpr5 foreign key (user_id) references usr (id); \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/static/style.css b/sweater-FileUpload/target/classes/static/style.css deleted file mode 100644 index 73ae03b..0000000 --- a/sweater-FileUpload/target/classes/static/style.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - color: #113; -} \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/greeting.ftl b/sweater-FileUpload/target/classes/templates/greeting.ftl deleted file mode 100644 index fc19b33..0000000 --- a/sweater-FileUpload/target/classes/templates/greeting.ftl +++ /dev/null @@ -1,5 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -
Hello, guest
- diff --git a/sweater-FileUpload/target/classes/templates/login.ftl b/sweater-FileUpload/target/classes/templates/login.ftl deleted file mode 100644 index 24d17d3..0000000 --- a/sweater-FileUpload/target/classes/templates/login.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<#import "parts/common.ftl" as c> -<#import "parts/login.ftl" as l> - -<@c.page> - <#if Session?? && Session.SPRING_SECURITY_LAST_EXCEPTION??> - - - <#if message??> - - - <@l.login "/login" false/> - \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/main.ftl b/sweater-FileUpload/target/classes/templates/main.ftl deleted file mode 100644 index 2f9ff58..0000000 --- a/sweater-FileUpload/target/classes/templates/main.ftl +++ /dev/null @@ -1,66 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -
-
- - -
-
- - -
-
-
-
- - <#if textError??> -
- ${textError} -
- -
-
- - <#if tagError??> -
- ${tagError} -
- -
-
-
- - -
-
- - -
-
-
-
- <#list messages as message> -
- <#if message.filename??> - - -
- ${message.text} - ${message.tag} -
-
- ${message.authorName} -
-
- ${message.ratingValue?ifExists} -
-
- <#else> - No message - -
- diff --git a/sweater-FileUpload/target/classes/templates/parts/common.ftl b/sweater-FileUpload/target/classes/templates/parts/common.ftl deleted file mode 100644 index 8d3261d..0000000 --- a/sweater-FileUpload/target/classes/templates/parts/common.ftl +++ /dev/null @@ -1,140 +0,0 @@ -<#macro page> - - - - - Sweater - - - - - - - - - - - - <#include "navbar.ftl"> -
- <#nested> -
- - - - - - - - - - - - \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/parts/login.ftl b/sweater-FileUpload/target/classes/templates/parts/login.ftl deleted file mode 100644 index 6b4365b..0000000 --- a/sweater-FileUpload/target/classes/templates/parts/login.ftl +++ /dev/null @@ -1,74 +0,0 @@ -<#macro login path isRegisterForm> - - - -<#macro logout> -
- - -
- \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/parts/navbar.ftl b/sweater-FileUpload/target/classes/templates/parts/navbar.ftl deleted file mode 100644 index 4126da5..0000000 --- a/sweater-FileUpload/target/classes/templates/parts/navbar.ftl +++ /dev/null @@ -1,31 +0,0 @@ -<#include "security.ftl"> -<#import "login.ftl" as l> -<#if user??> - - \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/parts/security.ftl b/sweater-FileUpload/target/classes/templates/parts/security.ftl deleted file mode 100644 index 90136da..0000000 --- a/sweater-FileUpload/target/classes/templates/parts/security.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<#assign - known = Session.SPRING_SECURITY_CONTEXT?? -> - -<#if known> - <#assign - user = Session.SPRING_SECURITY_CONTEXT.authentication.principal - name = user.getUsername() - isAdmin = user.isAdmin() - > -<#else > - <#assign - name = "unknown" - isAdmin = false - > - \ No newline at end of file diff --git a/sweater-FileUpload/target/classes/templates/profile.ftl b/sweater-FileUpload/target/classes/templates/profile.ftl deleted file mode 100644 index cea77ab..0000000 --- a/sweater-FileUpload/target/classes/templates/profile.ftl +++ /dev/null @@ -1,24 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -${message?ifExists} -
${username}
-
- -
- -
- -
-
-
- -
- -
-
- - -
- - diff --git a/sweater-FileUpload/target/classes/templates/registration.ftl b/sweater-FileUpload/target/classes/templates/registration.ftl deleted file mode 100644 index 6dc3566..0000000 --- a/sweater-FileUpload/target/classes/templates/registration.ftl +++ /dev/null @@ -1,7 +0,0 @@ -<#import "parts/common.ftl" as c> -<#import "parts/login.ftl" as l> - -<@c.page> -${message?ifExists} -<@l.login "/registration" true/> - diff --git a/sweater-FileUpload/target/classes/templates/userEdit.ftl b/sweater-FileUpload/target/classes/templates/userEdit.ftl deleted file mode 100644 index 4471a3b..0000000 --- a/sweater-FileUpload/target/classes/templates/userEdit.ftl +++ /dev/null @@ -1,17 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -User editor - -
- - <#list roles as role> -
- -
- - - - -
- diff --git a/sweater-FileUpload/target/classes/templates/userList.ftl b/sweater-FileUpload/target/classes/templates/userList.ftl deleted file mode 100644 index 6acdf12..0000000 --- a/sweater-FileUpload/target/classes/templates/userList.ftl +++ /dev/null @@ -1,24 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -List of users - - - - - - - - - - - <#list users as user> - - - - - - - -
NameRole
${user.username}<#list user.roles as role>${role}<#sep>, edit
- diff --git a/sweater-FileUpload/sweater.iml b/sweater.iml similarity index 85% rename from sweater-FileUpload/sweater.iml rename to sweater.iml index 3759287..28913e8 100644 --- a/sweater-FileUpload/sweater.iml +++ b/sweater.iml @@ -1,136 +1,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/sweater-FileUpload/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git a/sweater-FileUpload/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg b/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg similarity index 100% rename from sweater-FileUpload/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg rename to uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg diff --git a/sweater-FileUpload/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg b/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg similarity index 100% rename from sweater-FileUpload/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg rename to uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg diff --git "a/sweater-FileUpload/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" "b/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" similarity index 100% rename from "sweater-FileUpload/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" rename to "uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" diff --git a/sweater-FileUpload/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png b/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png similarity index 100% rename from sweater-FileUpload/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png rename to uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png diff --git a/sweater-FileUpload/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg b/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg similarity index 100% rename from sweater-FileUpload/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg rename to uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg diff --git a/sweater-FileUpload/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git "a/sweater-FileUpload/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git "a/sweater-FileUpload/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git a/sweater-FileUpload/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png b/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png similarity index 100% rename from sweater-FileUpload/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png rename to uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png diff --git a/sweater-FileUpload/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png b/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png similarity index 100% rename from sweater-FileUpload/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png rename to uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png diff --git a/sweater-FileUpload/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg b/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg similarity index 100% rename from sweater-FileUpload/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg rename to uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg diff --git "a/sweater-FileUpload/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" "b/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" similarity index 100% rename from "sweater-FileUpload/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" rename to "uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png"