Skip to content

added arch framework to set app location state #6

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.

Sign up for GitHub

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

Open
innayarantseva wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added arch framework to set app location state #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
"author": "",
"license": "ISC",
"devDependencies": {
"body-parser": "^1.18.3",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"eslint": "^5.7.0",
"eslint-loader": "^2.1.1",
"mini-css-extract-plugin": "^0.4.3",
"shri-arch": "git+https://github.com/innayarantseva/shri-arch.git",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.2"
},
Expand Down
5 changes: 4 additions & 1 deletion public/camera.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<header class="header">
<img class="header__logo" src="./assets/logo.svg" />
<div class="menu">
<div class="header__item">События</div>
<div class="header__item">
<a class="header__item-link" href="./index.html">События</a>
</div>
<div class="header__item">Сводка</div>
<div class="header__item">Устройства</div>
<div class="header__item">Сценарии</div>
Expand Down Expand Up @@ -138,5 +140,6 @@ <h1 class="title">Видеонаблюдение</h1>
</script>

<script src="camera.js"></script>
<script src="store.js"></script>
</body>
</html>
5 changes: 4 additions & 1 deletion public/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ h1 {
.header__item:hover {
opacity: 1;
}

.header__item-link {
color: #333333;
text-decoration: none;
}
/* Section Styles */

.section {
Expand Down
7 changes: 5 additions & 2 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
<header class="header">
<img class="header__logo" src="./assets/logo.svg" />
<div class="menu">
<div class="header__item">События</div>
<div class="header__item">
<a class="header__item-link" href="./index.html">События</a>
</div>
<div class="header__item">Сводка</div>
<div class="header__item">Устройства</div>
<div class="header__item">Сценарии</div>
<div class="header__item">
<a href="./camera.html">Камеры></a>
<a class="header__item-link" href="./camera.html">Камеры</a>
</div>
</div>
<img class="header__list" src="./assets/icon_list.svg">
Expand Down Expand Up @@ -126,5 +128,6 @@


<script src="main.js"></script>
<script src="store.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion public/main.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading