From a63dab8ce1b8d18ffa4b87facff872e05d638d30 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 19 Jan 2024 06:26:35 +0100 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5ff6309..ac6caa4 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,5 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store +.idea/aws.xml From 7a0f3b71d72ccf54debf6d99603bf8267aac9571 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 19 Jan 2024 06:26:43 +0100 Subject: [PATCH 2/4] Update aws.xml --- .idea/aws.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.idea/aws.xml b/.idea/aws.xml index 71ca66c..a7f7aa4 100644 --- a/.idea/aws.xml +++ b/.idea/aws.xml @@ -8,6 +8,9 @@ + + From 066e6eeb069c10097d195785c1a8bd5cc68a192f Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 19 Jan 2024 06:27:33 +0100 Subject: [PATCH 3/4] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ac6caa4..440bf0d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ build/ ### Mac OS ### .DS_Store .idea/aws.xml +/out/ From cc1b6cf0fb4e2be0b968b47a2a9d80b0311eac47 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 19 Jan 2024 08:03:46 +0100 Subject: [PATCH 4/4] Add license --- src/main/java/module-info.java | 16 ++++- src/main/java/org/example/FileSorterApp.java | 12 ++++ src/main/java/org/example/Launcher.java | 12 ++++ .../controller/FileSorterController.java | 12 ++++ .../EmptyDirectoryPathException.java | 12 ++++ .../InvalidDirectoryPathException.java | 12 ++++ .../NoDirectorySelectedException.java | 12 ++++ .../example/service/FolderPathValidator.java | 12 ++++ src/main/java/org/example/service/Sorter.java | 12 ++++ src/main/resources/components/theme.js | 60 ++++--------------- src/main/resources/fxml/fileSorter.fxml | 13 ++++ 11 files changed, 136 insertions(+), 49 deletions(-) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 655f7a0..074580b 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,8 +1,22 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. + module FileSorter { + requires javafx.controls; requires javafx.graphics; requires javafx.fxml; opens org.example; // Экспорт пакета org.example opens org.example.controller to javafx.fxml; -} \ No newline at end of file +} diff --git a/src/main/java/org/example/FileSorterApp.java b/src/main/java/org/example/FileSorterApp.java index 13acb9a..8521fd4 100644 --- a/src/main/java/org/example/FileSorterApp.java +++ b/src/main/java/org/example/FileSorterApp.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example; import javafx.application.Application; diff --git a/src/main/java/org/example/Launcher.java b/src/main/java/org/example/Launcher.java index 2b7eced..d1700e7 100644 --- a/src/main/java/org/example/Launcher.java +++ b/src/main/java/org/example/Launcher.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example; public class Launcher { diff --git a/src/main/java/org/example/controller/FileSorterController.java b/src/main/java/org/example/controller/FileSorterController.java index 8ce9ff1..7598d62 100644 --- a/src/main/java/org/example/controller/FileSorterController.java +++ b/src/main/java/org/example/controller/FileSorterController.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.controller; import javafx.event.ActionEvent; diff --git a/src/main/java/org/example/exception/EmptyDirectoryPathException.java b/src/main/java/org/example/exception/EmptyDirectoryPathException.java index b8b3f30..26ce92f 100644 --- a/src/main/java/org/example/exception/EmptyDirectoryPathException.java +++ b/src/main/java/org/example/exception/EmptyDirectoryPathException.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.exception; public class EmptyDirectoryPathException extends RuntimeException { diff --git a/src/main/java/org/example/exception/InvalidDirectoryPathException.java b/src/main/java/org/example/exception/InvalidDirectoryPathException.java index 0169fb9..e9a8855 100644 --- a/src/main/java/org/example/exception/InvalidDirectoryPathException.java +++ b/src/main/java/org/example/exception/InvalidDirectoryPathException.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.exception; public class InvalidDirectoryPathException extends RuntimeException { diff --git a/src/main/java/org/example/exception/NoDirectorySelectedException.java b/src/main/java/org/example/exception/NoDirectorySelectedException.java index c19c959..b801d9a 100644 --- a/src/main/java/org/example/exception/NoDirectorySelectedException.java +++ b/src/main/java/org/example/exception/NoDirectorySelectedException.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.exception; public class NoDirectorySelectedException extends RuntimeException { diff --git a/src/main/java/org/example/service/FolderPathValidator.java b/src/main/java/org/example/service/FolderPathValidator.java index 9adb9be..288da90 100644 --- a/src/main/java/org/example/service/FolderPathValidator.java +++ b/src/main/java/org/example/service/FolderPathValidator.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.service; import java.util.regex.Matcher; diff --git a/src/main/java/org/example/service/Sorter.java b/src/main/java/org/example/service/Sorter.java index 72d73bf..d93889e 100644 --- a/src/main/java/org/example/service/Sorter.java +++ b/src/main/java/org/example/service/Sorter.java @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. package org.example.service; import java.io.File; diff --git a/src/main/resources/components/theme.js b/src/main/resources/components/theme.js index 53719fc..0c0460c 100644 --- a/src/main/resources/components/theme.js +++ b/src/main/resources/components/theme.js @@ -1,3 +1,15 @@ +// Copyright 2024 Serhii Kushnerov +// 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 serhiikushnerov@gmail.com +// +// http://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. export const theme = createTheme({ palette: { primary: { @@ -13,52 +25,4 @@ export const theme = createTheme({ // grey: '#6B6C6F', }, }, - typography: { - fontFamily: ['Roboto', 'Helvetica Neue', 'Arial', 'sans-serif'].join(','), - h1: { - fontSize: 64, - fontWeight: 800, - lineHeight: '96px', - }, - h2: { - fontSize: 48, - fontWeight: 700, - lineHeight: '58px', - }, - h3: { - fontSize: 36, - fontWeight: 700, - lineHeight: '44px', - }, - h4: { - fontSize: 28, - fontWeight: 700, - lineHeight: '28px', - }, - h5: { - fontSize: 24, - fontWeight: 700, - lineHeight: '24px', - }, - h6: { - fontSize: 20, - fontWeight: 700, - lineHeight: '24px', - }, - subtitle1: { - fontSize: 14, - fontWeight: 700, - lineHeight: '18px', - }, - }, - - breakpoints: { - values: { - xs: 0, - sm: 600, - md: 900, - lg: 1200, - xl: 1536, - }, - }, }); diff --git a/src/main/resources/fxml/fileSorter.fxml b/src/main/resources/fxml/fileSorter.fxml index 763292d..a52bbe3 100644 --- a/src/main/resources/fxml/fileSorter.fxml +++ b/src/main/resources/fxml/fileSorter.fxml @@ -1,5 +1,18 @@ + + + + + + + + + + + + +