git.iko.soy/ilyakooo0.github.io
on master help sign in
Added presistance to sosalovo. Added proga/sosalovo. Refined design slightly. Added sitemap and SEO.
commit32e58e5157fdc827e4aa71d890262e099d3f1e3f authorilyakooo0 <ilyakooo0@gmail.com> dateSun 17 Jun 2018, 02:35 (8 years ago) parent59609d9
10 files changed+236−2
.gitignore+1 Gemfile+8 _config.yml+6 css/style.sass+5−2 diskra/sosalovo.html+1 javascript/diskra.sosalovo.js+27 javascript/linal.sosalovo.js+27 javascript/proga.sosalovo.js+87 linal/sosalovo.html+1 proga/sosalovo.html+73
.gitignore+1
@@ -1,3 +1,4 @@
11_site
22.sass-cache
33.jekyll-metadata
4+Gemfile.lock
Gemfilenew file+8
@@ -0,0 +1,8 @@
1+# frozen_string_literal: true
2+
3+source "https://rubygems.org"
4+
5+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
6+
7+gem 'jekyll-sitemap'
8+gem 'jekyll-seo-tag'
_config.yml+6
@@ -15,6 +15,12 @@ title: ilyakooo0
1515# baseurl: "" # the subpath of your site, e.g. /blog
1616# url: "http://yourdomain.com" # the base hostname & protocol for your site
1717
18+url: "https://iko.soy"
19+plugins:
20+ - jekyll-sitemap
21+ - jekyll-seo-tag
22+
23+
1824# Build settings
1925markdown: kramdown
2026
css/style.sass+5−2
@@ -31,6 +31,9 @@ $logoDim: 150px
3131 font-weight: bold
3232
3333
34+html
35+ background-color: $backgroundColor
36+
3437body
3538 background-color: $backgroundColor
3639 padding: 0
@@ -94,7 +97,7 @@ p
9497.page-content
9598 width: 100vw
9699 align: center
97− margin-top: 15vh
100+ margin-top: 13vh
98101
99102.tags
100103 width: 90vw
@@ -121,7 +124,7 @@ p
121124 @extend h2
122125
123126#logo
124− margin-top: 13px
127+ margin-top: 34px
125128 a
126129 display: block
127130 margin-left: auto
diskra/sosalovo.html+1
@@ -6,6 +6,7 @@ tag: Diskra
66custom_js:
77 - diskra.sosalovo
88 - jquery
9+ - js.cookie
910---
1011
1112 <h1 id="sosalovoCenter">sosalovo</h1>
javascript/diskra.sosalovo.js+27
@@ -1,4 +1,6 @@
11function update() {
2+ write()
3+
24 let result = $("#diskraSosalovoNumber")
35 let text = $("#diskraSosalovoText")
46
@@ -38,5 +40,30 @@ window.onload = function() {
3840 $("#KR4").keyup(update)
3941 $("#DZ4").keyup(update)
4042 $("#MIT").keyup(update)
43+
44+ read()
45+
4146 update()
47+}
48+
49+function read() {
50+ let obj = Cookies.getJSON('diskra.sosalovo')
51+ if (obj != undefined) {
52+ $("#KR3").val(obj.kr3)
53+ $("#DZ3").val(obj.dz3)
54+ $("#KR4").val(obj.kr4)
55+ $("#DZ4").val(obj.dz4)
56+ $("#MIT").val(obj.mit)
57+ }
58+}
59+
60+function write() {
61+ let obj = {
62+ "kr3": parseInt($("#KR3").val()) || 0,
63+ "dz3": parseInt($("#DZ3").val()) || 0,
64+ "kr4": parseInt($("#KR4").val()) || 0,
65+ "dz4": parseInt($("#DZ4").val()) || 0,
66+ "mit": parseInt($("#MIT").val()) || 0
67+ }
68+ Cookies.set('diskra.sosalovo', obj)
4269}
javascript/linal.sosalovo.js+27
@@ -1,4 +1,6 @@
11function update() {
2+ write()
3+
24 let result = $("#diskraSosalovoNumber")
35 let text = $("#diskraSosalovoText")
46
@@ -35,5 +37,30 @@ window.onload = function() {
3537 $("#Kollok").keyup(update)
3638 $("#KR3").keyup(update)
3739 $("#Egz").keyup(update)
40+
41+ read()
42+
3843 update()
44+}
45+
46+function read() {
47+ let obj = Cookies.getJSON('linal.sosalovo')
48+ if (obj != undefined) {
49+ $("#KDZ").val(obj.kdz)
50+ $("#Sem").val(obj.sem)
51+ $("#Kollok").val(obj.kollok)
52+ $("#KR3").val(obj.kr3)
53+ $("#Egz").val(obj.egz)
54+ }
55+}
56+
57+function write() {
58+ let obj = {
59+ "kdz": parseInt($("#KDZ").val()) || 0,
60+ "sem": parseInt($("#Sem").val()) || 0,
61+ "kollok": parseInt($("#Kollok").val()) || 0,
62+ "kr3": parseInt($("#KR3").val()) || 0,
63+ "egz": parseInt($("#Egz").val()) || 0
64+ }
65+ Cookies.set('linal.sosalovo', obj)
3966}
javascript/proga.sosalovo.jsnew file+87
@@ -0,0 +1,87 @@
1+function update() {
2+ write()
3+
4+ let result = $("#diskraSosalovoNumber")
5+ let text = $("#diskraSosalovoText")
6+
7+ result.text("")
8+ text.text("")
9+
10+ let sr3 = parseInt($("#SR3").val())
11+ let kr3 = parseInt($("#KR3").val())
12+ let sr4 = parseInt($("#SR4").val())
13+ let kr4 = parseInt($("#KR4").val())
14+ let kdz3 = parseInt($("#KDZ3").val())
15+ let ekr = parseInt($("#EKR").val())
16+ let podbel = parseInt($("#Podbel").val())
17+
18+ if (isNaN(sr3) ||
19+ isNaN(kr3) ||
20+ isNaN(sr4) ||
21+ isNaN(kr4) ||
22+ isNaN(kdz3)||
23+ isNaN(ekr) ||
24+ isNaN(podbel)) {
25+ return
26+ }
27+
28+ let no3 = 0.3*sr3 + 0.35*kdz3 + 0.35*kr3
29+ let no4 = 0.2*sr4 + 0.8*kr4
30+
31+ let no = Math.round(0.2*no3+0.8*no4)
32+
33+ let eo = Math.round(0.8*Math.min(ekr, podbel) + 0.2*Math.max(ekr, podbel))
34+ let r = Math.round(0.8*eo + 0.2*no)
35+
36+ result.text(r)
37+ if (r < 4) {
38+ text.text("тебя отчислили спасибо досвидания")
39+ }
40+}
41+
42+window.onload = function() {
43+ $("#SR3").change(update)
44+ $("#KR3").change(update)
45+ $("#SR4").change(update)
46+ $("#KR4").change(update)
47+ $("#KDZ3").change(update)
48+ $("#EKR").change(update)
49+ $("#Podbel").change(update)
50+ $("#SR3").keyup(update)
51+ $("#KR3").keyup(update)
52+ $("#SR4").keyup(update)
53+ $("#KR4").keyup(update)
54+ $("#KDZ3").keyup(update)
55+ $("#EKR").keyup(update)
56+ $("#Podbel").keyup(update)
57+
58+ read()
59+
60+ update()
61+}
62+
63+function read() {
64+ let obj = Cookies.getJSON('proga.sosalovo')
65+ if (obj != undefined) {
66+ $("#SR3").val(obj.sr3)
67+ $("#KR3").val(obj.kr3)
68+ $("#SR4").val(obj.sr4)
69+ $("#KR4").val(obj.kr4)
70+ $("#KDZ3").val(obj.kdz3)
71+ $("#EKR").val(obj.ekr)
72+ $("#Podbel").val(obj.podbel)
73+ }
74+}
75+
76+function write() {
77+ let obj = {
78+ "sr3": parseInt($("#SR3").val()) || 0,
79+ "kr3": parseInt($("#KR3").val()) || 0,
80+ "sr4": parseInt($("#SR4").val()) || 0,
81+ "kr4": parseInt($("#KR4").val()) || 0,
82+ "kdz3": parseInt($("#KDZ3").val()) || 0,
83+ "ekr": parseInt($("#EKR").val()) || 0,
84+ "podbel": parseInt($("#Podbel").val()) || 0
85+ }
86+ Cookies.set('proga.sosalovo', obj)
87+}
linal/sosalovo.html+1
@@ -6,6 +6,7 @@ tag: Linal
66custom_js:
77 - linal.sosalovo
88 - jquery
9+ - js.cookie
910---
1011
1112 <h1 id="sosalovoCenter">sosalovo</h1>
proga/sosalovo.htmlnew file+73
@@ -0,0 +1,73 @@
1+---
2+layout: page
3+title: sosalovo
4+permalink: proga/sosalovo
5+tag: Proga
6+custom_js:
7+ - proga.sosalovo
8+ - jquery
9+ - js.cookie
10+---
11+
12+ <h1 id="sosalovoCenter">sosalovo</h1>
13+ <div class="sosalovoPair">
14+ <div class="field">
15+ <div class="diskraSosalovoTitle">
16+ SR3
17+ </div>
18+ <input autocomplete="off" id="SR3" name="SR3" type="number" value="9" min="0" max="10">
19+ </div>
20+ <div class="field">
21+ <div class="diskraSosalovoTitle">
22+ KR3
23+ </div>
24+ <input autocomplete="off" id="KR3" name="KR3" type="number" value="9" min="0" max="10">
25+ </div>
26+ </div>
27+ <div class="sosalovoPair">
28+ <div class="field">
29+ <div class="diskraSosalovoTitle">
30+ SR4
31+ </div>
32+ <input autocomplete="off" id="SR4" name="SR4" type="number" value="5" min="0" max="10">
33+ </div>
34+ <div class="field">
35+ <div class="diskraSosalovoTitle">
36+ KR4
37+ </div>
38+ <input autocomplete="off" id="KR4" name="KR4" type="number" value="5" min="0" max="10">
39+ </div>
40+ </div>
41+ <div class="sosalovoPair">
42+ <div class="field">
43+ <div class="diskraSosalovoTitle">
44+ KDZ3
45+ </div>
46+ <input autocomplete="off" id="KDZ3" name="KDZ3" type="number" value="6" min="0" max="10">
47+ </div>
48+ </div>
49+ <div class="sosalovoPair">
50+ <div class="field">
51+ <div class="diskraSosalovoTitle">
52+ EKR
53+ </div>
54+ <input autocomplete="off" id="EKR" name="EKR" type="number" value="5" min="0" max="10">
55+ </div>
56+ <div class="field">
57+ <div class="diskraSosalovoTitle">
58+ Podbel
59+ </div>
60+ <input autocomplete="off" id="Podbel" name="Podbel" type="number" value="5" min="0" max="10">
61+ </div>
62+ </div>
63+
64+ <div class="diskraSosalovoResult">
65+ <div id="diskraSosalovoNumber">
66+
67+ </div>
68+
69+ <div id="diskraSosalovoText">
70+
71+ </div>
72+
73+ </div>