Skip to content

Commit 1952c42

Browse files
Adamo2499Adamo2499
authored
Merge pull request #1 from Adamo2499/dev
Global fixes and improves
2 parents 59e5791 + 1239590 commit 1952c42

38 files changed

+759
-419
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
*.class

‎WEB-INF/web.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" id="WebApp_ID">
3+
<display-name>MusicBaseSpring</display-name>
4+
<welcome-file-list>
5+
<welcome-file>index.html</welcome-file>
6+
<welcome-file>index.htm</welcome-file>
7+
<welcome-file>index.jsp</welcome-file>
8+
<welcome-file>default.html</welcome-file>
9+
<welcome-file>default.htm</welcome-file>
10+
<welcome-file>default.jsp</welcome-file>
11+
</welcome-file-list>
12+
</web-app>

‎bin/main/musicbase/controllers/AlbumsController.class‎

281 Bytes
Binary file not shown.

‎bin/main/musicbase/controllers/ArtistController.class‎

312 Bytes
Binary file not shown.

‎bin/main/musicbase/controllers/SongsController.class‎

555 Bytes
Binary file not shown.

‎bin/main/musicbase/models/Album.class‎

350 Bytes
Binary file not shown.

‎bin/main/musicbase/models/Artist.class‎

413 Bytes
Binary file not shown.

‎bin/main/musicbase/models/Song.class‎

244 Bytes
Binary file not shown.

‎bin/main/static/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="stylesheet" href="style.css">
77
</head>
88
<body>
9-
<header th:replace="parts/parts.html :: header"></header><br />
9+
<header th:replace="parts/parts.html :: header">MusicBase</header><br />
1010
<nav>
1111
<ul>
1212
<li class="dropdown"><a href="/MusicBase">Strona główna</a></li>

‎bin/main/static/style.css‎

Lines changed: 152 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,152 @@
1-
@charset "UTF-8";
2-
* {
3-
margin: 0;
4-
padding: 0;
5-
}
6-
.dropdown {
7-
width: 25%;
8-
}
9-
10-
.dropdown-content {
11-
display: none;
12-
position: absolute;
13-
width: 25%;
14-
overflow: auto;
15-
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
16-
background-image: linear-gradient(to bottom right, red, darkred);
17-
18-
}
19-
20-
.dropdown:hover .dropdown-content {
21-
display: block;
22-
}
23-
24-
.dropdown-content a {
25-
display: block;
26-
color: white;
27-
padding: 5px;
28-
text-decoration: none;
29-
}
30-
31-
.dropdown-content a:hover {
32-
color: #FFFFFF;
33-
background-color: red;
34-
}
35-
36-
ul {
37-
list-style-type: none;
38-
margin: 0;
39-
padding: 0;
40-
overflow: hidden;
41-
/* background-color: #f00; */
42-
background-image: linear-gradient(to bottom right, red, darkred);
43-
}
44-
45-
li {
46-
float: left;
47-
}
48-
49-
li a {
50-
display: block;
51-
color: white;
52-
text-align: center;
53-
padding: 14px 16px;
54-
text-decoration: none;
55-
}
56-
57-
header {
58-
background-image: linear-gradient(to bottom right, darkred, red);
59-
color: white;
60-
text-align: center;
61-
padding-bottom: 30px;
62-
}
63-
64-
footer {
65-
background-image: linear-gradient(to bottom right, darkred, red);
66-
color: white;
67-
text-align: center;
68-
padding-bottom: 30px;
69-
position:absolute;
70-
bottom:0;
71-
width:100%; /* Height of the footer */
72-
position: fixed;
73-
}
74-
75-
h2 {
76-
text-align: center;
77-
}
78-
79-
table,th,td {
80-
text-align: center;
81-
margin: 0 auto;
82-
border: 1px solid black;
83-
padding: 3px;
84-
}
85-
86-
.form-inline {
87-
text-align: center;
88-
margin: 0 auto;
89-
}
90-
91-
sup {
92-
color: red;
93-
}
94-
95-
img {
96-
width: 50%;
97-
height: 50%;
98-
}
99-
100-
.alert {
101-
text-align: center;
102-
color: whitesmoke;
103-
}
104-
105-
#buttons{
106-
margin: 0 auto;
107-
text-align: center;
108-
width: 100%;
109-
}
110-
111-
button {
112-
transition-duration: 0.4s;
113-
border: none;
114-
color: white;
115-
padding: 15px 32px;
116-
text-align: center;
117-
text-decoration: none;
118-
font-size: 16px;
119-
border-radius: 100rem;
120-
margin: 0 auto;
121-
}
122-
123-
input[type = file]{
124-
background-color: #f4f4ec;
125-
border: 1px solid #f8f4f4;
126-
}
127-
128-
button[type = submit]{
129-
background-color: #a00c04;
130-
display: inline-flex;
131-
justify-content: center;
132-
align-items: center;
133-
}
134-
135-
button[type = reset]{
136-
background-color: black;
137-
display: inline-flex;
138-
justify-content: center;
139-
align-items: center;
140-
}
141-
142-
button:hover{
143-
box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19);
144-
}
145-
146-
/* @media only screen and (max-width: 600px) {} */
1+
@charset "UTF-8";
2+
3+
* {
4+
margin: 0;
5+
padding: 0;
6+
}
7+
8+
.dropdown {
9+
width: 25%;
10+
}
11+
12+
.dropdown-content {
13+
display: none;
14+
position: absolute;
15+
width: 25%;
16+
overflow: auto;
17+
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
18+
background-image: linear-gradient(to bottom right, red, darkred);
19+
20+
}
21+
22+
.dropdown:hover .dropdown-content {
23+
display: block;
24+
}
25+
26+
.dropdown-content a {
27+
display: block;
28+
color: white;
29+
padding: 5px;
30+
text-decoration: none;
31+
}
32+
33+
.dropdown-content a:hover {
34+
color: #FFFFFF;
35+
background-color: red;
36+
}
37+
38+
ul {
39+
list-style-type: none;
40+
margin: 0;
41+
padding: 0;
42+
overflow: hidden;
43+
/* background-color: #f00; */
44+
background-image: linear-gradient(to bottom right, red, darkred);
45+
}
46+
47+
li {
48+
float: left;
49+
}
50+
51+
li a {
52+
display: block;
53+
color: white;
54+
text-align: center;
55+
padding: 14px 16px;
56+
text-decoration: none;
57+
}
58+
59+
header {
60+
background-image: linear-gradient(to bottom right, darkred, red);
61+
color: white;
62+
text-align: center;
63+
padding-bottom: 30px;
64+
}
65+
66+
footer {
67+
background-image: linear-gradient(to bottom right, darkred, red);
68+
color: white;
69+
text-align: center;
70+
padding-bottom: 30px;
71+
position: absolute;
72+
bottom: 0;
73+
width: 100%;
74+
/* Height of the footer */
75+
position: fixed;
76+
}
77+
78+
h2 {
79+
text-align: center;
80+
}
81+
82+
table,
83+
th,
84+
td {
85+
text-align: center;
86+
margin: 0 auto;
87+
border: 1px solid black;
88+
padding: 3px;
89+
}
90+
91+
.form-inline {
92+
text-align: center;
93+
margin: 0 auto;
94+
}
95+
96+
sup {
97+
color: red;
98+
}
99+
100+
img {
101+
width: 50%;
102+
height: 50%;
103+
}
104+
105+
.alert {
106+
text-align: center;
107+
color: whitesmoke;
108+
}
109+
110+
button {
111+
transition-duration: 0.4s;
112+
border: none;
113+
color: white;
114+
padding: 15px 32px;
115+
text-align: center;
116+
text-decoration: none;
117+
font-size: 16px;
118+
border-radius: 100rem;
119+
margin: 0 auto;
120+
}
121+
122+
input[type=file] {
123+
background-color: #f4f4ec;
124+
border: 1px solid #f8f4f4;
125+
}
126+
127+
button[type=submit] {
128+
background-color: darkred;
129+
display: inline-flex;
130+
justify-content: center;
131+
align-items: center;
132+
}
133+
134+
.return {
135+
background-color: #a00c04;
136+
display: inline-flex;
137+
justify-content: center;
138+
align-items: center;
139+
}
140+
141+
button[type=reset] {
142+
background-color: black;
143+
display: inline-flex;
144+
justify-content: center;
145+
align-items: center;
146+
}
147+
148+
button:hover {
149+
box-shadow: 0 12px 16px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19);
150+
}
151+
152+
/* @media only screen and (max-width: 600px) {} */

0 commit comments

Comments
 (0)