Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remodel caberger project to suit our backend and db #1

Open
wants to merge 87 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
11f1db1
change image name docker-compose-production.yml
mandelrosaliejanina Nov 18, 2021
1428bb4
bounce pom.xml
mandelrosaliejanina Nov 18, 2021
054bc13
set back
mandelrosaliejanina Nov 18, 2021
1edc1f7
set to 11
mandelrosaliejanina Nov 18, 2021
a134c5a
split install ssh key
mandelrosaliejanina Nov 18, 2021
2580ea8
switch back to shortend version
mandelrosaliejanina Nov 18, 2021
bd2e070
add frontend
mandelrosaliejanina Nov 19, 2021
07f9af9
change branch name
mandelrosaliejanina Nov 19, 2021
7369347
change volume path
mandelrosaliejanina Nov 19, 2021
adbd3cb
remove dot
mandelrosaliejanina Nov 23, 2021
41d7b6f
change volume
mandelrosaliejanina Nov 23, 2021
621640b
copy tar file to vm
mandelrosaliejanina Dec 2, 2021
5d264e0
copy tar file to vm
mandelrosaliejanina Dec 2, 2021
89057df
change working dir
mandelrosaliejanina Dec 2, 2021
7ab321b
delete nginx from docker-compose.yml
mandelrosaliejanina Dec 7, 2021
32ca318
fix spaces
mandelrosaliejanina Dec 7, 2021
d68bcbf
comment copy tar
mandelrosaliejanina Dec 7, 2021
ece42bb
fix copy tar to /var/www/html
mandelrosaliejanina Dec 7, 2021
4f3b192
move contents
mandelrosaliejanina Dec 7, 2021
a966c81
move contents
mandelrosaliejanina Dec 7, 2021
b6006a7
update frontend
mandelrosaliejanina Dec 7, 2021
50c511b
change name to frontend
mandelrosaliejanina Dec 7, 2021
01df3a9
change name to frontend
mandelrosaliejanina Dec 7, 2021
7412db0
remove old contents
mandelrosaliejanina Dec 7, 2021
1a184cf
copy files
mandelrosaliejanina Mar 15, 2022
87ee25f
frontend
mandelrosaliejanina Mar 15, 2022
f41bf88
change target release
mandelrosaliejanina Mar 15, 2022
c877f76
add doku
mandelrosaliejanina Mar 15, 2022
3068ec7
copy www
mandelrosaliejanina Mar 15, 2022
0c8935c
add docker to www
mandelrosaliejanina Mar 15, 2022
3d1b260
copy jar files
mandelrosaliejanina Mar 15, 2022
4ad725a
fix
mandelrosaliejanina Mar 15, 2022
b7374de
fix
mandelrosaliejanina Mar 15, 2022
109ef34
fix
mandelrosaliejanina Mar 15, 2022
3efa949
fix
mandelrosaliejanina Mar 15, 2022
9b93dc1
fix
mandelrosaliejanina Mar 15, 2022
b9f9641
fix
mandelrosaliejanina Mar 15, 2022
a89f7ee
fix
mandelrosaliejanina Mar 15, 2022
7c52afa
fix
mandelrosaliejanina Mar 15, 2022
5de0b92
fix
mandelrosaliejanina Mar 15, 2022
531cf13
fix/2
caberger Mar 15, 2022
60e4fa0
copy to appsrv
caberger Mar 15, 2022
5240a69
add %prod
mandelrosaliejanina Mar 15, 2022
2f1e567
Merge remote-tracking branch 'origin/main'
mandelrosaliejanina Mar 15, 2022
65b96b5
listens to all ip addresses
mandelrosaliejanina Mar 15, 2022
7529095
update frontend
mandelrosaliejanina Mar 16, 2022
01a8f4f
Merge pull request #1 from mandelrosaliejanina/feature/file-upload
mandelrosaliejanina Mar 16, 2022
9954073
delete Tests and skip
mandelrosaliejanina Apr 11, 2022
1ccfde2
change application.properties
mandelrosaliejanina Apr 11, 2022
3c80b0e
comment line
mandelrosaliejanina Apr 11, 2022
e994900
delete
mandelrosaliejanina Apr 11, 2022
440848e
make deployment easy
mandelrosaliejanina Apr 11, 2022
8d49602
create new github secrets
mandelrosaliejanina Apr 11, 2022
edc0bbe
change to mvn
mandelrosaliejanina Apr 11, 2022
233503c
move to appsrv
mandelrosaliejanina Apr 11, 2022
3aaf8f1
change path
mandelrosaliejanina Apr 11, 2022
dc8598a
change ports
mandelrosaliejanina Apr 11, 2022
6aa9aa4
change pw
mandelrosaliejanina Apr 11, 2022
52ef669
add frontend deployment
mandelrosaliejanina Apr 11, 2022
ad87d8f
change source
mandelrosaliejanina Apr 11, 2022
b21018f
change source
mandelrosaliejanina Apr 11, 2022
8b1c023
change source
mandelrosaliejanina Apr 11, 2022
4f1b022
change to click
mandelrosaliejanina Apr 17, 2022
bcc94e8
fix upload
mandelrosaliejanina Apr 17, 2022
509977f
add api to path
mandelrosaliejanina Apr 17, 2022
855113f
change to 300M
mandelrosaliejanina Apr 17, 2022
c0cf67f
add preallocate-body-buffer
mandelrosaliejanina Apr 17, 2022
4879b89
fix path
mandelrosaliejanina Apr 17, 2022
5394213
add properties
mandelrosaliejanina Apr 17, 2022
8d997d7
add /
mandelrosaliejanina Apr 17, 2022
df8b9e7
add sout
mandelrosaliejanina Apr 17, 2022
8231a3b
add 8080 to env
mandelrosaliejanina Apr 17, 2022
a35c167
add volumes
mandelrosaliejanina Apr 17, 2022
e1dfe36
change volumes
mandelrosaliejanina Apr 17, 2022
962eec9
remove volumes
mandelrosaliejanina Apr 17, 2022
04205f4
change path
mandelrosaliejanina Apr 17, 2022
b38233a
change env
mandelrosaliejanina Apr 17, 2022
cdb6c69
add volumes
mandelrosaliejanina Apr 17, 2022
1010c73
add Loading
mandelrosaliejanina Apr 17, 2022
ca1e9c2
add level ro mat select of course
mandelrosaliejanina Apr 18, 2022
deadce3
remove old yml files
mandelrosaliejanina Apr 18, 2022
a04f2b4
remove requests folder
mandelrosaliejanina Apr 18, 2022
6fb43f3
remove k8s folder
mandelrosaliejanina Apr 18, 2022
e7c408a
clean code
mandelrosaliejanina Apr 18, 2022
66c38c1
create courses and new accounts
mandelrosaliejanina Apr 18, 2022
95c694b
add docu
mandelrosaliejanina Apr 19, 2022
bde873c
add docu
mandelrosaliejanina Apr 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change path
mandelrosaliejanina committed Apr 17, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 04205f434d21317925fa8e48dfe90de37d7afccb
3 changes: 2 additions & 1 deletion appsrv/src/main/java/at/htl/boundary/FileEndpoint.java
Original file line number Diff line number Diff line change
@@ -103,7 +103,8 @@ public Response upload2(InputStream inputStream,
//String path = fileRepository.imageHome() + "/" + fileRepository.TARGET_UPLOAD_FOLDER;
String lastdir = imagename.contains(".mp4") || imagename.contains(".mov") ? "video/" : "audio/";
Course course = courseRepository.find("id", courseId).stream().findFirst().orElse(null);
String path = fileRepository.TARGET_UPLOAD_FOLDER + lastdir + course.level.description.toLowerCase() + "/"+ course.title + "/";
String path = "";
//fileRepository.TARGET_UPLOAD_FOLDER + lastdir + course.level.description.toLowerCase() + "/"+ course.title + "/";

D_File fileEntry = fileRepository.createFile(imagename, path + imagename ,description);
File dir = new File(Paths.get("").toAbsolutePath() + "/src/main/resources/META-INF/resources/" + path);