Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
251 commits
Select commit Hold shift + click to select a range
c4b2a12
Beispiel
zaphodess Jan 31, 2020
ef7a664
Merge pull request #4 from Marcuse7/master
zaphodess Jan 31, 2020
ef20364
Merge branch 'develop' into zaphodess
zaphodess Jan 31, 2020
2d0bc49
POM
zaphodess Jan 31, 2020
0d968a6
Merge branch 'zaphodess' of https://github.com/Marcuse7/serialseries …
zaphodess Jan 31, 2020
76b4a68
pom.xml dependency geschlossen -bugfix
zaphodess Jan 31, 2020
896094f
Merge pull request #5 from Marcuse7/zaphodess
Marcuse7 Jan 31, 2020
531c031
Add Eclipse-specific files to .gitignore
Marcuse7 Feb 3, 2020
8f28e66
Merge pull request #6 from Marcuse7/exclude_eclipse_artifacts
Robert0816 Feb 3, 2020
6b90ae4
add pic, Code Z9-10
Robert0816 Feb 3, 2020
c6690f9
Merge pull request #7 from Marcuse7/newImageIndex
Marcuse7 Feb 3, 2020
f8c4e10
Add YAML script for automated testing
Marcuse7 Feb 3, 2020
110919a
Merge pull request #8 from Marcuse7/maven_test-step
erucu Feb 3, 2020
203d812
Index.html Code Z12-18,Stations.hmtl und benötigten Klassen,images hi…
Robert0816 Feb 4, 2020
ad043c6
Merge pull request #9 from Marcuse7/addStationshtml
Marcuse7 Feb 4, 2020
55c2b3b
Update entities for JPA, add relations
Marcuse7 Feb 5, 2020
8acdf9a
Removed Program entity.
Marcuse7 Feb 5, 2020
63eae46
Fix air_date_time property.
Marcuse7 Feb 5, 2020
7ddc519
Merge branch 'develop' into importable_entities
Marcuse7 Feb 5, 2020
2ee079b
Merge pull request #12 from Marcuse7/importable_entities
zaphodess Feb 5, 2020
b7219b5
app.proZ1,StatConZ21-23,StationRepAufgeraeumt
Robert0816 Feb 6, 2020
3f62acb
Merge pull request #13 from Marcuse7/StationsKorrektur
Marcuse7 Feb 6, 2020
f07431b
spring security
erucu Feb 6, 2020
f963b4e
Update README.md
erucu Feb 7, 2020
ac2a4bc
.antMatchers("/", "/images/**", "/styles.css", "/webjars/**").permitA…
erucu Feb 7, 2020
b27c50a
Merge remote-tracking branch 'origin/spring-security' into spring-sec…
erucu Feb 7, 2020
bff3ce1
Add property _picture_ to entity _station_
Marcuse7 Feb 10, 2020
56265ad
Merge pull request #15 from Marcuse7/Add_station_picture
Marcuse7 Feb 10, 2020
4eff0c1
Add database autofill data
Marcuse7 Feb 10, 2020
aae5d55
Make tglaser code owner
Marcuse7 Feb 10, 2020
7763052
Neue Version
erucu Feb 11, 2020
0b4fc0f
Merge pull request #16 from Marcuse7/Auto_fill_database
Robert0816 Feb 11, 2020
37fde25
Neue Version
erucu Feb 11, 2020
b6c492e
Merge branch 'develop' into spring-security
zaphodess Feb 11, 2020
38cb500
einige Anpassungen, Senderlogo hinzugefügt,stations.html umgebaut, 1.…
Robert0816 Feb 11, 2020
d2210c6
Merge pull request #22 from Marcuse7/spring-security
zaphodess Feb 11, 2020
2dcb521
Add data for table User, fix user name length.
Marcuse7 Feb 11, 2020
5bfef76
Merge pull request #24 from Marcuse7/add_user_data
erucu Feb 11, 2020
8775fe2
Admin ist jetzt hard coded.
erucu Feb 11, 2020
0fc2649
Admin ist jetzt hard coded.
erucu Feb 11, 2020
5bf6fb1
Admin ist jetzt hard coded.
erucu Feb 11, 2020
8ed03fa
Nochmal User-Daten eingefügt
Marcuse7 Feb 11, 2020
cc94593
Merge pull request #28 from Marcuse7/add_users_to_autofill
erucu Feb 11, 2020
bf0afe7
Admin ist jetzt hard coded.
erucu Feb 11, 2020
09b79f1
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 11, 2020
94b9f34
Jetzt funzt es.
erucu Feb 11, 2020
54a874b
Jetzt funzt es.
erucu Feb 11, 2020
5c2d09c
Merge pull request #29 from Marcuse7/spring-security-2
Marcuse7 Feb 12, 2020
fbea8f3
Jetzt mit der richtigen data.sql Datei.
erucu Feb 12, 2020
c928790
Jetzt mit der richtigen data.sql Datei.
erucu Feb 12, 2020
98f687e
Merge pull request #31 from Marcuse7/spring-security-2
zaphodess Feb 12, 2020
11081e5
Merge branch 'develop' into StationSeries
Robert0816 Feb 12, 2020
54e9946
Merge pull request #32 from Marcuse7/StationSeries
zaphodess Feb 12, 2020
d110cb6
Links im Header auf bestehende Seiten, Bild anzeigen auf series_all
zaphodess Feb 12, 2020
0205667
Merge pull request #34 from Marcuse7/tabellenview
Marcuse7 Feb 12, 2020
2b19a61
Optimierung im User-Bereich.
erucu Feb 12, 2020
d609b15
Optimierungen im User-Bereich
erucu Feb 12, 2020
b39161b
Design angepasst: bitte inhaltlich prüfen
zaphodess Feb 12, 2020
6356af1
Wichtiger Fix - ein JavaScript für Bootstrap hat gefehlt
zaphodess Feb 12, 2020
8b5b3c6
Merge pull request #36 from Marcuse7/tabellenview
erucu Feb 12, 2020
4505de1
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 12, 2020
5e5c519
Add subscription of series
Marcuse7 Feb 12, 2020
a5bd434
Remember me.
erucu Feb 12, 2020
c348b4a
Series_all is sort of responsive now, problem still: pics take ages to
zaphodess Feb 13, 2020
d38fe49
Subscribing to series is persisted (table subscriptions)
Marcuse7 Feb 13, 2020
3570bf7
Merge pull request #37 from Marcuse7/spring-security-2
Marcuse7 Feb 13, 2020
0a757e4
Logout-Button hinzugefügt.
erucu Feb 13, 2020
ac2d27b
blabla
zaphodess Feb 13, 2020
4e0550d
Merge pull request #40 from Marcuse7/spring-security-2
zaphodess Feb 13, 2020
f469366
hilfegit add *
Robert0816 Feb 13, 2020
edf0626
Subscribing to series is persisted (table subscriptions)
Marcuse7 Feb 13, 2020
755c848
Merge branch 'series_watchlist' of https://github.com/Marcuse7/serial…
Marcuse7 Feb 13, 2020
0d9f00a
Merge branch 'develop' into responsive-tables
zaphodess Feb 13, 2020
450d9ef
Merge branch 'develop' into responsive-tables
erucu Feb 13, 2020
95199f3
Merge branch 'develop' into series_watchlist
Marcuse7 Feb 13, 2020
f4c68cb
Merge pull request #38 from Marcuse7/responsive-tables
erucu Feb 13, 2020
97b7570
Merge branch 'develop' into series_watchlist
Marcuse7 Feb 13, 2020
2a7d373
Merge pull request #41 from Marcuse7/series_watchlist
erucu Feb 13, 2020
61ba547
Logout-Button hinzugefügt.
erucu Feb 13, 2020
3e351b9
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 13, 2020
a61246d
Merge pull request #42 from Marcuse7/spring-security-2
zaphodess Feb 13, 2020
472d231
Merge branch 'develop' into responsive-tables
zaphodess Feb 13, 2020
a4f8632
Logout-Button nach rechts gerückt.
erucu Feb 13, 2020
4129311
Logout-Button nach rechts gerückt.
erucu Feb 13, 2020
3623286
2. Seite
zaphodess Feb 13, 2020
8fcc582
Merge pull request #43 from Marcuse7/spring-security-2
zaphodess Feb 13, 2020
dd610c8
Merge branch 'develop' into responsive-tables
zaphodess Feb 13, 2020
6fb8275
Merge pull request #45 from Marcuse7/responsive-tables
Marcuse7 Feb 13, 2020
74ef194
Logout-Button von der Grösse an den Search-Button angepasst..
erucu Feb 13, 2020
73f0a5e
Suche im Header
zaphodess Feb 13, 2020
c1b307d
Merge pull request #47 from Marcuse7/responsive-tables
erucu Feb 14, 2020
6987cb8
Merge branches 'develop' and 'spring-security-2' of https://github.co…
erucu Feb 14, 2020
5e9263c
Merge branch 'develop' into spring-security-2
Robert0816 Feb 14, 2020
8df8a17
Merge pull request #46 from Marcuse7/spring-security-2
Robert0816 Feb 14, 2020
d8465a1
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 14, 2020
449fe31
SerienProSender
Robert0816 Feb 14, 2020
e1ff022
Merge branch 'develop' into scheduleList
Robert0816 Feb 14, 2020
ee91289
Merge pull request #48 from Marcuse7/scheduleList
zaphodess Feb 14, 2020
3792e86
stations.html
Robert0816 Feb 14, 2020
84a10f5
stations.hmtl
Robert0816 Feb 14, 2020
4bdf2d6
Header gefixt - bitte beim Mergen aufpassen, dass keine automatischen…
zaphodess Feb 14, 2020
73046e6
Merge branch 'develop' into responsive-tables
Robert0816 Feb 14, 2020
f0415f2
Merge pull request #49 from Marcuse7/responsive-tables
Robert0816 Feb 14, 2020
e702207
Merge branch 'develop' into scheduleList
zaphodess Feb 14, 2020
f7baa61
Merge pull request #50 from Marcuse7/scheduleList
zaphodess Feb 14, 2020
2f95282
StationLogo angepasst
Robert0816 Feb 14, 2020
70f5754
Merge pull request #51 from Marcuse7/SenderLogo
zaphodess Feb 14, 2020
919f562
Header und footer hinzugefügt, schedule.html bereinigt.
Robert0816 Feb 14, 2020
8d54840
Merge pull request #52 from Marcuse7/HeaderFooter
zaphodess Feb 14, 2020
76d061c
Registrierung
erucu Feb 14, 2020
1ad1ba9
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 14, 2020
07febdc
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 14, 2020
2672b15
adjusted gitignore
erucu Feb 14, 2020
ef5a340
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 14, 2020
41493dd
Merge branch 'develop' into code_owner
tglaser Feb 14, 2020
e3472b3
Merge pull request #19 from Marcuse7/code_owner
tglaser Feb 14, 2020
3bfca91
Merge branch 'develop' into spring-security-2
Marcuse7 Feb 16, 2020
8535f76
Merge pull request #53 from Marcuse7/spring-security-2
Marcuse7 Feb 16, 2020
06b7892
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 17, 2020
7fb2d90
Merge pull request #54 from Marcuse7/spring-security-2
zaphodess Feb 17, 2020
c0f9930
Suche über Description und Name, auch mehr als ein Ergebnis wird
zaphodess Feb 17, 2020
85df029
Subscription via toggle switch.
Marcuse7 Feb 17, 2020
6205882
Merge pull request #55 from Marcuse7/suche4
Marcuse7 Feb 17, 2020
45d66ac
Subscription via toggle switch.
Marcuse7 Feb 17, 2020
e562f3d
Merge branch 'toggle_subscription' of https://github.com/Marcuse7/ser…
Marcuse7 Feb 17, 2020
213b5fc
Merge branch 'toggle_subscription' of https://github.com/Marcuse7/ser…
Marcuse7 Feb 17, 2020
e2fba08
Merge branch 'toggle_subscription' of https://github.com/Marcuse7/ser…
Marcuse7 Feb 17, 2020
d500863
Merge pull request #56 from Marcuse7/toggle_subscription
zaphodess Feb 18, 2020
9707ac5
Login- und Logout-Bereich überarbeitet
erucu Feb 18, 2020
98bf7ec
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 18, 2020
69729c1
Login- und Logout-Bereich überarbeitet
erucu Feb 18, 2020
5d2cf11
Merge pull request #57 from Marcuse7/spring-security-2
zaphodess Feb 18, 2020
b752415
Login- und Logout-Bereich überarbeitet
erucu Feb 20, 2020
770a800
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 20, 2020
94242e3
Merge pull request #58 from Marcuse7/spring-security-2
zaphodess Feb 20, 2020
4a866a0
Login- und Logout-Bereich überarbeitet
erucu Feb 20, 2020
f3857fa
Login- und Logout-Bereich überarbeitet
erucu Feb 20, 2020
4a2fed4
Änderungen an series_all.html
zaphodess Feb 20, 2020
81cd7c2
Login- und Logout-Bereich überarbeitet
erucu Feb 20, 2020
d4acc34
Merge pull request #59 from Marcuse7/spring-security-2
zaphodess Feb 20, 2020
bfa1c54
Merge branch 'develop' into series_all_new
zaphodess Feb 20, 2020
a1c2514
Merge pull request #60 from Marcuse7/series_all_new
Marcuse7 Feb 20, 2020
2de3d39
Bilder jetzt 4x3
Marcuse7 Feb 20, 2020
648d600
Merge pull request #61 from Marcuse7/landscape_images
erucu Feb 21, 2020
d2faf3f
Replace data on startup instead of inserting it.
Marcuse7 Feb 21, 2020
dcc3b80
Update application.properties
erucu Feb 21, 2020
ad7bc66
Merge pull request #62 from Marcuse7/replace_data
erucu Feb 21, 2020
14b17d9
Replace data instead of insert, also USER table.
Marcuse7 Feb 21, 2020
adc3ae0
Merge pull request #63 from Marcuse7/replace_data_2
erucu Feb 21, 2020
3785f25
Modal Register
erucu Feb 21, 2020
d44e3db
Registration fix (set user.id to auto-increment)
Marcuse7 Feb 21, 2020
a5e2760
Merge branch 'develop' of https://github.com/Marcuse7/serialseries in…
erucu Feb 21, 2020
c92cf8b
Registration fix (set user.id to auto-increment)
Marcuse7 Feb 21, 2020
d609560
Merge branch 'user_table_start' of https://github.com/Marcuse7/serial…
Marcuse7 Feb 21, 2020
2d452e2
Update User.java
Marcuse7 Feb 21, 2020
9ba85e8
Merge pull request #64 from Marcuse7/spring-security-2
Marcuse7 Feb 21, 2020
f351fed
View series detail.
Marcuse7 Feb 21, 2020
5d8ff4d
Modal Register
erucu Feb 21, 2020
0ca9957
small corrections
zaphodess Feb 21, 2020
a73475d
merge-Konflikt aufgelöst
zaphodess Feb 21, 2020
7a8f055
Merge branch 'develop' into user_table_start
zaphodess Feb 21, 2020
ff106bf
Merge pull request #65 from Marcuse7/user_table_start
zaphodess Feb 21, 2020
d9afe9d
Merge branch 'develop' into small-cosmetics
zaphodess Feb 21, 2020
6226689
Merge pull request #66 from Marcuse7/small-cosmetics
erucu Feb 21, 2020
278de08
Modal Register
erucu Feb 21, 2020
ceed937
Merge branch 'develop' into spring-security-2
erucu Feb 21, 2020
039f283
Merge branches 'develop' and 'spring-security-2' of https://github.co…
erucu Feb 21, 2020
bb85bd1
Modal Register
erucu Feb 21, 2020
7543503
Merge pull request #67 from Marcuse7/spring-security-2
zaphodess Feb 21, 2020
1d25093
Confirmation text
erucu Feb 21, 2020
a421486
Merge branches 'develop' and 'spring-security-2' of https://github.co…
erucu Feb 21, 2020
5d84cca
Confirmation text
erucu Feb 21, 2020
162f820
Merge pull request #68 from Marcuse7/spring-security-2
Marcuse7 Feb 21, 2020
a8d41f6
Click on Series open detail view.
Marcuse7 Feb 21, 2020
c23503c
View series detail.
Marcuse7 Feb 21, 2020
fb019be
Click on Series open detail view.
Marcuse7 Feb 21, 2020
17c8553
Merge branch 'view_one_series' of https://github.com/Marcuse7/serials…
Marcuse7 Feb 21, 2020
c3543ce
Merge pull request #69 from Marcuse7/view_one_series
zaphodess Feb 25, 2020
d75a815
Test
zaphodess Feb 25, 2020
15ff58d
Merge branch 'small-cosmetics' of https://github.com/Marcuse7/serials…
zaphodess Feb 25, 2020
a93e8db
Merge branch 'develop' into small-cosmetics
zaphodess Feb 25, 2020
6a59691
Ausgabe der DataTime angepasst,schedule.html angepasst
Robert0816 Feb 25, 2020
b77323a
Merge pull request #70 from Marcuse7/datatimeOutput
zaphodess Feb 25, 2020
d40e085
Neue Bilder
Robert0816 Feb 25, 2020
f68b9db
Merge pull request #71 from Marcuse7/scheduleImageNew
zaphodess Feb 25, 2020
00ba25f
small changes
zaphodess Feb 25, 2020
1926aba
Merge branch 'develop' into small-cosmetics
zaphodess Feb 25, 2020
9399ac5
Alle Station werden angezeigt, korrektur station.java LAZY
Robert0816 Feb 25, 2020
395da2e
Links auf index geändert
zaphodess Feb 25, 2020
4333de3
Merge branch 'develop' into stationKorrekur
zaphodess Feb 25, 2020
2002777
Merge pull request #72 from Marcuse7/stationKorrekur
zaphodess Feb 25, 2020
0aff468
SenderLogo wird angezeigt
Robert0816 Feb 25, 2020
a807053
Merge branch 'develop' into StationNameLogoOutput
zaphodess Feb 26, 2020
ccd0bb6
Merge pull request #74 from Marcuse7/StationNameLogoOutput
zaphodess Feb 26, 2020
31ced0d
Sendersuche eingebaut
Robert0816 Feb 26, 2020
1a0fb26
Merge branch 'develop' into small-cosmetics
zaphodess Feb 26, 2020
e3b3d0f
Merge pull request #73 from Marcuse7/small-cosmetics
Robert0816 Feb 26, 2020
4d15577
ReturnButton
Robert0816 Feb 26, 2020
e68810a
Merge pull request #75 from Marcuse7/StationReturnButtonNew
zaphodess Feb 26, 2020
f768852
Links im Footer und Breite der Cards auf series_all geändert
zaphodess Feb 26, 2020
b0535f7
Begrenzung der Ausgabe Featured Series auf 30 auf Basis eines String-…
zaphodess Feb 26, 2020
f079e51
Filter flexibler gemacht: Man kann jetzt auch in der description ein …
zaphodess Feb 26, 2020
443f099
Paginierung für Serienliste
Marcuse7 Feb 26, 2020
a705682
Paginierung fuer Serienliste
Marcuse7 Feb 26, 2020
8c390f6
Sendersuche eingebaut
Robert0816 Feb 26, 2020
003af39
Merge pull request #77 from Marcuse7/breiten-und-abstaende
Robert0816 Feb 26, 2020
bd16245
Merge branch 'develop' into StationSearch
zaphodess Feb 26, 2020
284eec5
Merge pull request #78 from Marcuse7/StationSearch
zaphodess Feb 26, 2020
56b6b07
fix
zaphodess Feb 26, 2020
5bf3bd5
Merge pull request #79 from Marcuse7/fix
Robert0816 Feb 26, 2020
33fae60
Sendersuche fix
Robert0816 Feb 26, 2020
4a6b31f
Merge pull request #80 from Marcuse7/stationCentre
Marcuse7 Feb 26, 2020
dcb2b89
Add paginated page to header
Marcuse7 Feb 26, 2020
92ef07c
Merge branch 'series_table_pagination' of https://github.com/Marcuse7…
Marcuse7 Feb 26, 2020
2ff6408
Merge branch 'develop' into series_table_pagination
zaphodess Feb 26, 2020
87be7bf
auf deutsch umgestellt
Robert0816 Feb 26, 2020
5a2566d
Merge pull request #81 from Marcuse7/series_table_pagination
zaphodess Feb 26, 2020
76bb088
Merge branch 'develop' into PicNachUnten
zaphodess Feb 26, 2020
d0f901a
Merge pull request #82 from Marcuse7/PicNachUnten
zaphodess Feb 26, 2020
0eb4481
Übersetzt ins Deutsche
zaphodess Feb 26, 2020
cef800d
Merge pull request #83 from Marcuse7/deutsche-sprache
Robert0816 Feb 26, 2020
811e304
Confirmation text
erucu Feb 27, 2020
44515e8
Modal Login
erucu Feb 27, 2020
929a28a
Merge pull request #85 from Marcuse7/spring-security
Robert0816 Feb 27, 2020
af71f0c
Modal Login
erucu Feb 27, 2020
1e9d5af
Merge pull request #86 from Marcuse7/spring-security
Robert0816 Feb 27, 2020
ae09012
Modal Login
erucu Feb 27, 2020
9023593
Merge branches 'develop' and 'spring-security' of https://github.com/…
erucu Feb 27, 2020
da9c558
Merge pull request #87 from Marcuse7/spring-security
zaphodess Feb 27, 2020
aa24286
Serien-Einzelansicht enthält Sendetermine und Abo-Slider.
Marcuse7 Feb 27, 2020
67a0373
Merge branch 'develop' into remind_upcoming_schedule
zaphodess Feb 27, 2020
8d4b379
Merge pull request #88 from Marcuse7/remind_upcoming_schedule
zaphodess Feb 27, 2020
6d832f1
series-controller geändert
zaphodess Feb 27, 2020
67e7665
Merge pull request #89 from Marcuse7/merge-controller
Marcuse7 Feb 27, 2020
3d53fd4
CSS Pfad unter WebSecurityConfig angepasst
erucu Feb 27, 2020
c3e87ec
Merge pull request #90 from Marcuse7/spring-security
zaphodess Feb 27, 2020
0f38a4c
fix
Robert0816 Feb 27, 2020
b87d68f
Merge branch 'develop' into fix
zaphodess Feb 27, 2020
f184187
Merge pull request #91 from Marcuse7/fix
zaphodess Feb 27, 2020
2d11a1f
Fix show subscriptions.
Marcuse7 Feb 27, 2020
a3c501d
Merge branch 'develop' into fix_show_subscriptions
Marcuse7 Feb 27, 2020
357e238
Merge pull request #92 from Marcuse7/fix_show_subscriptions
zaphodess Feb 27, 2020
ec6ee03
CSS Pfad unter WebSecurityConfig angepasst
erucu Feb 27, 2020
e7860d5
Merge branches 'develop' and 'spring-security' of https://github.com/…
erucu Feb 27, 2020
f8b3e32
Merge pull request #93 from Marcuse7/spring-security
zaphodess Feb 27, 2020
d134321
"Series paginiert" und "Tipps Redaktion" gefixt
Marcuse7 Feb 28, 2020
9b64bbf
Merge pull request #94 from Marcuse7/fix_paged_series_table
zaphodess Feb 28, 2020
a935fa2
Bugfixes und Refactoring
zaphodess Feb 28, 2020
959667d
Fix in der Suche
zaphodess Feb 28, 2020
c1e9701
Merge pull request #96 from Marcuse7/icons
erucu Feb 28, 2020
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* tglaser
17 changes: 17 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Java CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Maven
run: mvn -B package --file pom.xml
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ cmake-build-*/

# IntelliJ
out/
.idea/
serialseries.iml

# mpeltonen/sbt-idea plugin
.idea_modules/
Expand All @@ -94,3 +96,21 @@ fabric.properties

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

# Eclipse stuff
*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
.externalToolBuilders/
*.launch
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# serialseries
WCS Team Project "Serial Series" 2019

Username: user
Password: password
39 changes: 36 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency><!-- fixed jdbc -->
</dependency>
<dependency>
<groupId>com.nulab-inc</groupId>
<artifactId>zxcvbn</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.21</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
Expand All @@ -35,16 +46,29 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
<version>2.1.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down Expand Up @@ -78,6 +102,11 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand All @@ -90,6 +119,10 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;

@SpringBootApplication
public class ThymeleafApplication {

public static void main(String[] args) {
SpringApplication.run(ThymeleafApplication.class, args);
}

@Bean
public PasswordEncoder getPasswordEncoder() {
return new BCryptPasswordEncoder();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/**
* Created by AEr on 06.02.20.
*/


package com.wildcodeschool.serialseries.thymeleaf;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;

import java.util.concurrent.TimeUnit;

@Configuration
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {

private final UserDetailsService userDetailsService;

private final PasswordEncoder passwordEncoder;

@Autowired
public WebSecurityConfig(UserDetailsService userDetailsService, PasswordEncoder passwordEncoder) {

this.userDetailsService = userDetailsService;
this.passwordEncoder = passwordEncoder;
}

@Override
protected void configure(HttpSecurity http) throws Exception {
http
.csrf().disable()
.authorizeRequests()
.antMatchers("/", "/images/**", "/css/style.css", "/webjars/**").permitAll()
.antMatchers("/register").permitAll()
.antMatchers("/confirm").permitAll()
.anyRequest()
.authenticated()
.and()
.formLogin()
.loginPage("/login").permitAll()
.defaultSuccessUrl("/", true)
.and()
.rememberMe() // defaults to 2 weeks
.tokenValiditySeconds((int) TimeUnit.DAYS.toSeconds(21))
.and()
.logout()
.logoutUrl("/logout")
.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET"))
.clearAuthentication(true)
.invalidateHttpSession(true)
.deleteCookies("JSESSIONID", "remember-me")
.logoutSuccessUrl("/");
}

@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder);
}

@Override
public void configure(WebSecurity webSecurity) {
webSecurity.ignoring().antMatchers(
"https://json.schedulesdirect.org/20141201/image/assets/**"
);
}

public static void main(String[] args) {
System.out.println(new BCryptPasswordEncoder().encode("admin"));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* Created by AEr on 11.02.20.
*/


package com.wildcodeschool.serialseries.thymeleaf.bootstrap;

import com.wildcodeschool.serialseries.thymeleaf.entity.User;
import com.wildcodeschool.serialseries.thymeleaf.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;

import java.util.Optional;

//@Component
public class BootstrapAdminUser implements CommandLineRunner {

private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;

@Autowired
public BootstrapAdminUser(UserRepository userRepository, PasswordEncoder passwordEncoder) {
this.userRepository = userRepository;
this.passwordEncoder = passwordEncoder;
}

@Override
public void run(String... args) throws Exception {
Optional<User> optionalAdmin = userRepository.findByName("admin");
if (optionalAdmin.isEmpty()) {
System.out.println("*** No admin user, creating admin/admin");
User admin = new User();
admin.setName("admin");
admin.setRole("ADMIN");
admin.setPassword(passwordEncoder.encode("admin"));
userRepository.save(admin);
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.wildcodeschool.serialseries.thymeleaf.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;

import com.wildcodeschool.serialseries.thymeleaf.repository.EpisodeRepository;

@Controller
public class EpisodeController {

@Autowired
private EpisodeRepository episodeRepo;

@GetMapping("/episode")
public String getAll(Model model) {

model.addAttribute("episodes", episodeRepo.findAll());
//model.addAttribute("series_name", seriesRepo.findAll());
return "episodes";
}


}


Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ public class IndexController {
public String home() {
return "index";
}

// @GetMapping("/login")
// public String login(){return "login";}
}
Loading