Skip to content

N
NewSite v3.0
Commit 87adab3e authored by Sergey Serov's avatar Sergey Serov
Browse files
Options

New Project

parent 72e0111e
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 88 deletions
package-lock.json
View file @ 87adab3e
...@@ -2223,6 +2223,11 @@ ...@@ -2223,6 +2223,11 @@
"tweetnacl": "^0.14.3" "tweetnacl": "^0.14.3"
} }
}, },
"bezier-easing": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz",
"integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY="
},
"bfj": { "bfj": {
"version": "6.1.2", "version": "6.1.2",
"resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz", "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
...@@ -2328,6 +2333,11 @@ ...@@ -2328,6 +2333,11 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true "dev": true
}, },
"bootstrap": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
},
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
...@@ -2835,8 +2845,7 @@ ...@@ -2835,8 +2845,7 @@
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true, "dev": true
"optional": true
}, },
"coa": { "coa": {
"version": "2.0.2", "version": "2.0.2",
...@@ -5365,8 +5374,7 @@ ...@@ -5365,8 +5374,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5387,14 +5395,12 @@ ...@@ -5387,14 +5395,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5409,20 +5415,17 @@ ...@@ -5409,20 +5415,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5539,8 +5542,7 @@ ...@@ -5539,8 +5542,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5552,7 +5554,6 @@ ...@@ -5552,7 +5554,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5567,7 +5568,6 @@ ...@@ -5567,7 +5568,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5575,14 +5575,12 @@ ...@@ -5575,14 +5575,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5601,7 +5599,6 @@ ...@@ -5601,7 +5599,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5682,8 +5679,7 @@ ...@@ -5682,8 +5679,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5695,7 +5691,6 @@ ...@@ -5695,7 +5691,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5781,8 +5776,7 @@ ...@@ -5781,8 +5776,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5818,7 +5812,6 @@ ...@@ -5818,7 +5812,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5838,7 +5831,6 @@ ...@@ -5838,7 +5831,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5882,14 +5874,12 @@ ...@@ -5882,14 +5874,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -9737,8 +9727,7 @@ ...@@ -9737,8 +9727,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true, "dev": true
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
...@@ -11400,6 +11389,14 @@ ...@@ -11400,6 +11389,14 @@
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz",
"integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==" "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ=="
}, },
"vue-scrollto": {
"version": "2.17.1",
"resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.17.1.tgz",
"integrity": "sha512-uxOJXg6cZL88B+hTXRHDJMR+gHGiaS70ZTNk55fE5Z2TdwyIx9K/IHoNeTrtBrM6u3FASAIymKjZaQLmDf8Ykg==",
"requires": {
"bezier-easing": "2.1.0"
}
},
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
......
package.json
View file @ 87adab3e
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.3.1",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"register-service-worker": "^1.6.2", "register-service-worker": "^1.6.2",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-router": "^3.0.3", "vue-router": "^3.0.3",
"vue-scrollto": "^2.17.1",
"vuex": "^3.0.1" "vuex": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
......
public/index.html
View file @ 87adab3e
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>site</title> <title>site</title>
<style>
body{
margin: 0;
}
</style>
</head> </head>
<body> <body>
<noscript> <noscript>
......
src/App.vue
View file @ 87adab3e
<template> <template>
<div id="app"> <div id="app">
<nav class="container-fluid" id="navigator"> <nav class="container-fluid" id="navigator">
<div class="row"> <div class="row">
<transition name="fade"> <transition name="fade">
<div v-if="!mobile" id="logotip_div" class="WidthNavigation col-md-3"> <div v-if="!mobile" id="logotip_div" class="WidthNavigation col-md-3">
<img id="logotip" src="./source/Logo.png" /> <img id="logotip" src="./source/Logo.png" />
</div> </div>
</transition> </transition>
<div class="WidthNavigation col-md-7"> <div class="WidthNavigation TitlesNavigation col-md-8">
<router-link class="navig" to="/" exact><span>Главная</span></router-link> <router-link class="navig" to="/" exact><span>Главная</span></router-link>
<router-link class="navig" to="/product"><span>Оборудование</span></router-link> <router-link class="navig" to="/product"><span>Оборудование</span></router-link>
<router-link class="navig" to="/files"><span>Услуги</span></router-link> <router-link class="navig" to="/files"><span>Услуги</span></router-link>
<router-link class="navig" to="/contact"><span>Контакты</span></router-link> <router-link class="navig" to="/contact"><span>Контакты</span></router-link>
</div> </div>
</div> </div>
</transition>
</nav> </nav>
<transition name="fade"> <transition name="fade">
<router-view ref="page"></router-view> <router-view ref="page"></router-view>
</transition> </transition>
<!-- <button v-scroll-to="'#app'">OOOOOOOOOOOOOOOOOOOOOOOOO</button> -->
</div> </div>
</template> </template>
<script>
export default {
name: 'app',
data () {
return {
mobile: false,
}
},
methods:{
Up: function(){
this.$refs.page.move(1)
},
Before: function(){
this.mobile = this.$parent.mobile;
},
}
}
</script>
<style> <style>
::-webkit-scrollbar{ ::-webkit-scrollbar{
width: 0px; width: 0px;
background: transparent; background: transparent;
} }
body{ body{
//-ms-user-select: none; -ms-user-select: none;
//-moz-user-select: none; -moz-user-select: none;
//-khtml-user-select: none; -khtml-user-select: none;
//-webkit-user-select: none; -webkit-user-select: none;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
position: relative;
} }
@font-face { @font-face {
font-family: "Europe"; font-family: "Europe";
...@@ -76,20 +57,21 @@ body{ ...@@ -76,20 +57,21 @@ body{
@media only screen and (min-width: 320px) and (max-width: 1399px) { @media only screen and (min-width: 320px) and (max-width: 1399px) {
#navigator{ #navigator{
position: absolute; /* position: absolute; */
padding: 1em; padding: 1em;
z-index: 100; z-index: 100;
width: 100vw;
} }
} }
@media only screen and (min-width: 1400px) { @media only screen and (min-width: 1400px) {
#navigator{ #navigator{
position: absolute; /* position: absolute; */
padding: 1.7em; padding: 1.7em;
z-index: 100; z-index: 100;
} }
} }
.navig span{ .navig span{
font-size: 1.5em; font-size: 2em;
color:#fff; color:#fff;
font-weight: 500; font-weight: 500;
margin-right: 1em; margin-right: 1em;
...@@ -110,24 +92,29 @@ a.navig:hover span{ ...@@ -110,24 +92,29 @@ a.navig:hover span{
background-size: 100% 2px; background-size: 100% 2px;
} }
.WidthNavigation{ .WidthNavigation{
width: 40vw;
margin: 0 auto; margin: 0 auto;
display: table-cell;
}
.WidthNavigation.TitlesNavigation{
width: 60vw;
text-align: right;
vertical-align: middle;
} }
.router-link-exact-active span{ .router-link-exact-active span{
color: red; color: #00aeff;
} }
a.router-link-exact-active:hover span{ a.router-link-exact-active:hover span{
color: red; color: #00aeff;
} }
div#logotip_div{ div#logotip_div{
max-width: 24vw; max-width: 38vw;
} }
img#logotip{ img#logotip{
max-width: 500px; max-width: 500px;
width: 33vw; width: 33vw;
pointer-events: none; pointer-events: none;
} }
#app{ body{
background-image: url('./source/Background.jpg') ; background-image: url('./source/Background.jpg') ;
background-size: cover; background-size: cover;
} }
...@@ -169,3 +156,24 @@ img#logotip{ ...@@ -169,3 +156,24 @@ img#logotip{
} }
} }
</style> </style>
<script>
export default {
name: 'app',
data () {
return {
mobile: false,
}
},
methods:{
Up: function(){
this.$refs.page.move(1)
},
Before: function(){
this.mobile = this.$parent.mobile;
},
}
}
</script>
\ No newline at end of file
src/components/Main.vue
View file @ 87adab3e
<template> <template>
<div id="main"> <div id="main">
<div> <div id="block_title">
<img src="../source/Bacground.png" /> <p id="title">{{Title}}</p>
</div>
<div id="strelka">
<span>∨</span>
</div> </div>
</div> </div>
</template> </template>
...@@ -13,11 +15,27 @@ ...@@ -13,11 +15,27 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-align: center; text-align: center;
color: #2c3e50; color: #2c3e50;
/* height: 100vh; */
} }
#main div{ #main div{
width: 100%; width: 100%;
/* background-image: url('../source/Bacground.png') */ /* background-image: url('../source/Bacground.png') */
} }
#main #block_title{
width: 42vw;
margin: 0 auto;
margin-top: 3%;
margin-right: 12%;
}
#main #title{
width: 95%;
margin: 0 auto;
font-size: 7.5em;
color: white;
text-align: left;
white-space: normal;
line-height: 0.9em;
}
</style> </style>
<script> <script>
...@@ -27,7 +45,7 @@ export default { ...@@ -27,7 +45,7 @@ export default {
data () { data () {
return { return {
Title:'Мы видим весь мусор в космосе!'
} }
}, },
......
src/main.js
View file @ 87adab3e
...@@ -2,6 +2,9 @@ import Vue from 'vue' ...@@ -2,6 +2,9 @@ import Vue from 'vue'
import App from './App.vue' import App from './App.vue'
import router from './router' import router from './router'
var VueScrollTo = require('vue-scrollto');
Vue.use(VueScrollTo)
Vue.config.productionTip = false Vue.config.productionTip = false
new Vue({ new Vue({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment