Skip to content

Commit a7ddf22

Browse files
paskalpaskal
committed
move js and css and png files to the root dir, remove unused css classes
1 parent 23c626e commit a7ddf22

7 files changed

Lines changed: 30 additions & 53 deletions

File tree

‎backend/web/add/index.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,31 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
6+
77
<title>Добавление правила — uReadability</title>
88

99
<script>
10-
var login = localStorage.getItem('login'),
11-
pass = localStorage.getItem('password');
12-
13-
if (! (login && pass)) {
10+
if (! (localStorage.getItem('login') && localStorage.getItem('password'))) {
1411
location.href = '/login/?back=' + location.href;
1512
}
1613
</script>
17-
18-
<link rel="shortcut icon" type="image/png" href="/files/favicon.png">
1914

20-
<link rel="stylesheet" href="/css/main.css">
15+
<link rel="shortcut icon" type="image/png" href="/favicon.png">
16+
17+
<link rel="stylesheet" href="/main.css">
2118

2219
<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
2320

24-
<script src="/js/main.js"></script>
21+
<script src="/main.js"></script>
2522
</head>
2623
<body class="page">
27-
24+
2825
<div class="header wrapper page__header">
2926
<a href="/" class="header__title link">uReadability</a>
3027
<ul class="menu header__menu">
3128
<li class="menu__item menu__item_right"><a href="#logout" id="logout" class="link">Выйти</a></li>
3229
</ul>
33-
</div>
30+
</div>
3431

3532
<div class="wrapper">
3633
<div class="rule form page__rule" id="rule">
@@ -69,7 +66,7 @@
6966
<input type="button" class="form__button rule__button-save" value="Сохранить">
7067

7168
<div class="form__loader form__loader_hidden"></div>
72-
</div>
69+
</div>
7370
<div class="preview" id="preview">
7471
<div class="preview__tip">Название:</div>
7572
<div class="preview__title preview__data"></div>

‎backend/web/edit/index.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,31 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
6+
77
<title>Редактирование правила — uReadability</title>
88

99
<script>
10-
var login = localStorage.getItem('login'),
11-
pass = localStorage.getItem('password');
12-
13-
if (! (login && pass)) {
10+
if (! (localStorage.getItem('login') && localStorage.getItem('password'))) {
1411
location.href = '/login/?back=' + location.href;
1512
}
1613
</script>
17-
18-
<link rel="shortcut icon" type="image/png" href="/files/favicon.png">
1914

20-
<link rel="stylesheet" href="/css/main.css">
15+
<link rel="shortcut icon" type="image/png" href="/favicon.png">
16+
17+
<link rel="stylesheet" href="/main.css">
2118

2219
<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
2320

24-
<script src="/js/main.js"></script>
21+
<script src="/main.js"></script>
2522
</head>
2623
<body class="page">
27-
24+
2825
<div class="header wrapper page__header">
2926
<a href="/" class="header__title link">uReadability</a>
3027
<ul class="menu header__menu">
3128
<li class="menu__item menu__item_right"><a href="#logout" id="logout" class="link">Выйти</a></li>
3229
</ul>
33-
</div>
30+
</div>
3431

3532
<div class="wrapper">
3633
<div class="rule form page__rule" id="rule">
@@ -69,7 +66,7 @@
6966
<input type="button" class="form__button rule__button-save" value="Сохранить">
7067

7168
<div class="form__loader form__loader_hidden"></div>
72-
</div>
69+
</div>
7370
<div class="preview" id="preview">
7471
<div class="preview__tip">Название:</div>
7572
<div class="preview__title preview__data"></div>

backend/web/files/favicon.png renamed to backend/web/favicon.png

File renamed without changes.

‎backend/web/index.html‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,13 @@
66

77
<title>uReadability</title>
88

9-
<script>
10-
var login = localStorage.getItem('login'),
11-
pass = localStorage.getItem('password');
9+
<link rel="shortcut icon" type="image/png" href="/favicon.png">
1210

13-
if (! (login && pass)) {
14-
location.href = '/login/?back=' + location.href;
15-
}
16-
</script>
17-
18-
<link rel="shortcut icon" type="image/png" href="/files/favicon.png">
19-
20-
<link rel="stylesheet" href="/css/main.css">
11+
<link rel="stylesheet" href="/main.css">
2112

2213
<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
2314

24-
<script src="/js/main.js"></script>
15+
<script src="/main.js"></script>
2516
</head>
2617
<body class="page">
2718

‎backend/web/login/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
6+
77
<title>Вход — uReadability</title>
8-
9-
<link rel="shortcut icon" type="image/png" href="/files/favicon.png">
108

11-
<link rel="stylesheet" href="/css/main.css">
9+
<link rel="shortcut icon" type="image/png" href="/favicon.png">
10+
11+
<link rel="stylesheet" href="/main.css">
1212

1313
<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
1414

15-
<script src="/js/main.js"></script>
15+
<script src="/main.js"></script>
1616
</head>
1717
<body class="page">
1818
<script>
19-
var back = getParameterByName('back');
19+
const back = getParameterByName('back');
2020

21-
if (login && password) {
21+
if (localStorage.getItem('login') && localStorage.getItem('password')) {
2222
if (back) {
2323
location.href = back;
2424
} else {

backend/web/css/main.css renamed to backend/web/main.css

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@
7979
color: #333;
8080
font-size: 14px;
8181
}
82-
.form__input-tip {
83-
margin-top: -7px;
84-
color: #aaa;
85-
font-size: 10px;
86-
}
87-
.form__input-tip_error {
88-
color: #f00000;
89-
}
9082
.form__button-tip {
9183
margin-top: 2px;
9284
color: #aaa;
@@ -143,7 +135,7 @@
143135
}
144136

145137
/* main blocks */
146-
.common__list-nostyle, .menu {
138+
.menu {
147139
padding: 0;
148140
margin: 0;
149141
list-style: none;
@@ -214,7 +206,7 @@
214206
color: #f00000;
215207
}
216208

217-
.common__table-nostyle, .rules__table {
209+
.rules__table {
218210
border: none;
219211
border-spacing: 0;
220212
}

backend/web/js/main.js renamed to backend/web/main.js

File renamed without changes.

0 commit comments

Comments
 (0)