Skip to content
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.

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

Мороховцев cайт #93

Open
wants to merge 78 commits into
base: Viktor_Morohovtsev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
9acf321
Initial app
Oct 3, 2019
56d629a
Merge branch 'master' into Viktor_Morohovtsev
Oct 10, 2019
aeb27bc
Sample of 1st lab
Oct 10, 2019
0247220
Tests samples
Oct 17, 2019
d514055
Added actions file
jskonst Oct 24, 2019
b29aa60
Fixed run steps (#28)
jskonst Oct 24, 2019
dbae387
Test actions on PR (#30)
jskonst Oct 24, 2019
953427e
Added tests and sample A|B tasks
jskonst Oct 24, 2019
62b5d9e
Added class task example, added vscode conf
Nov 7, 2019
aa0b4b1
Merge branch 'master' of https://github.com/ISUCT/Tprogramming_147_2019
Nov 7, 2019
9faae24
merged changes
DressCodeBoy Nov 7, 2019
997c01c
task a,b and tests
DressCodeBoy Nov 28, 2019
36010a7
using collections
DressCodeBoy Dec 4, 2019
dd46d49
netcore 2.1
DressCodeBoy Dec 4, 2019
570aa3d
netcore version
DressCodeBoy Dec 5, 2019
fae2fb3
added class
DressCodeBoy Dec 7, 2019
1598ab5
added tests
DressCodeBoy Dec 14, 2019
fc2e147
severe polymorphism
DressCodeBoy Dec 16, 2019
50bf321
calculation of age
DressCodeBoy Dec 16, 2019
b654e74
calculation of age
DressCodeBoy Dec 16, 2019
85a725b
fix problems in branch DressCodeBoy
DressCodeBoy Dec 16, 2019
15ed182
style
DressCodeBoy Dec 29, 2019
2b0bdb6
something HTML
DressCodeBoy Dec 29, 2019
0c237e7
Merge branch 'Viktor_Morohovtsev' into HTML
DressCodeBoy Dec 29, 2019
bed78d7
try push HTML normal
DressCodeBoy Dec 29, 2019
7fdadf7
okay
DressCodeBoy Dec 29, 2019
2e1da3b
okay2
DressCodeBoy Dec 29, 2019
d15e32a
Merge branch 'HTML' of https://github.com/DressCodeBoy/Tprogramming_1…
DressCodeBoy Dec 29, 2019
12220d0
ABCD
DressCodeBoy Dec 29, 2019
4968143
workspace html
DressCodeBoy Jan 4, 2020
5236936
оболочка для сайта
DressCodeBoy Feb 24, 2020
ce99816
web 1.1
DressCodeBoy Feb 24, 2020
bc21496
mda
DressCodeBoy Feb 25, 2020
2402a5b
added site to the root directory
DressCodeBoy Feb 25, 2020
26305c5
Update index.html
DressCodeBoy Feb 25, 2020
6c5db4a
Update index.html
DressCodeBoy Feb 25, 2020
12d9f42
fix contact
DressCodeBoy Mar 8, 2020
d0738d4
Merge branch 'master' of https://github.com/DressCodeBoy/Tprogramming…
DressCodeBoy Mar 8, 2020
1db3c83
fix refresh index.html
DressCodeBoy Mar 8, 2020
e7782e5
trying fix not showing bg images
DressCodeBoy Mar 8, 2020
daf78ae
change path bg images
DressCodeBoy Mar 8, 2020
250a4fe
i don't understand(
DressCodeBoy Mar 8, 2020
cef76db
Update style.css
DressCodeBoy Mar 8, 2020
de8781b
Update style.css
DressCodeBoy Mar 8, 2020
4b992db
Update style.css
DressCodeBoy Mar 8, 2020
0bb2ee6
Update style.css
DressCodeBoy Mar 8, 2020
94c6ac7
Update style.css
DressCodeBoy Mar 8, 2020
f8f812e
Update style.css
DressCodeBoy Mar 8, 2020
a905318
Update style.css
DressCodeBoy Mar 8, 2020
ae89bdb
Update index.html
DressCodeBoy Mar 8, 2020
56a4e5c
Update index.html
DressCodeBoy Mar 8, 2020
4634e7d
Update index.html
DressCodeBoy Mar 8, 2020
16c699d
Update index.html
DressCodeBoy Mar 8, 2020
66842e2
Update index.html
DressCodeBoy Mar 8, 2020
6258eb6
Update index.html
DressCodeBoy Mar 8, 2020
091b1e3
Update index.html
DressCodeBoy Mar 8, 2020
b3468b5
1
DressCodeBoy Mar 8, 2020
7787b09
Merge branch 'master' of https://github.com/DressCodeBoy/Tprogramming…
DressCodeBoy Mar 8, 2020
107d842
Update index.html
DressCodeBoy Mar 8, 2020
902d380
Update index.html
DressCodeBoy Mar 8, 2020
6ce4ee3
2
DressCodeBoy Mar 8, 2020
136287a
Merge branch 'master' of https://github.com/DressCodeBoy/Tprogramming…
DressCodeBoy Mar 8, 2020
130ccb6
change path css and js
DressCodeBoy Mar 9, 2020
0020906
change path style
DressCodeBoy Mar 10, 2020
5fdd944
1
DressCodeBoy Mar 10, 2020
5c9f706
fix path
DressCodeBoy Mar 10, 2020
ce60155
555
DressCodeBoy Mar 10, 2020
95cb29f
fix path icon
DressCodeBoy Mar 10, 2020
f5cdf03
333
DressCodeBoy Mar 10, 2020
e24e0a0
change path js
DressCodeBoy Mar 10, 2020
94c5e31
added / path js
DressCodeBoy Mar 10, 2020
de4338c
return dotnet tests
DressCodeBoy Mar 10, 2020
9f1444e
added music on 3th page
DressCodeBoy Mar 10, 2020
c43b0a9
необработанный адрес с github для аудио
DressCodeBoy Mar 10, 2020
a069ed3
виджет
DressCodeBoy Mar 10, 2020
b0478d9
изменил положение виджета
DressCodeBoy Mar 10, 2020
f30ef39
fix bg
DressCodeBoy Mar 10, 2020
642cf1a
666
DressCodeBoy Mar 10, 2020
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
27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/CourseApp/bin/Debug/netcoreapp3.0/CourseApp.dll",
"args": [],
"cwd": "${workspaceFolder}/CourseApp",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/CourseApp/CourseApp.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/CourseApp/CourseApp.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/CourseApp/CourseApp.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
143 changes: 143 additions & 0 deletions Contact.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Описание нашего сайта" />
<meta name="keywords" content="ISUCT html site" />
<meta name="author" content="Мороховцев Виктор" />

<link
rel="stylesheet"
href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
crossorigin="anonymous"
/>
<link rel="stylesheet" type="text/css" href="public/css/style.css" />
<title>Moro WebSite</title>
<script type="text/javascript" src="https://vk.com/js/api/openapi.js?167"></script>

<script type="text/javascript"> VK.init({apiId: 7352673, onlyWidgets: true});
</script>
</head>

<body>
<!-- начало навигационной панели -->
<nav
class="navbar navbar-expand-lg navbar-dark background-color fixed-top bg-faded"
style="background-color: rgb(228, 0, 190);"
>
<a class="navbar-brand" href="index.html">
<img
src="public/img/logo.png"
width="30"
height="30"
class="d-inline-block align-top"
alt=""
/>
DressCodeBoy
</a>
<button
class="navbar-toggler"
type="button"
data-toggle="collapse"
data-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav">
<a class="nav-item nav-link" href="index.html"
>Главная <span class="sr-only">(current)</span></a
>
<a class="nav-item nav-link" href="Info.html">Информация</a>
<a class="nav-item nav-link active" href="#">Обо мне</a>
<a class="nav-item nav-link disabled" href="#">В разработке</a>
</div>
</div>
<nav class="navbar-nav ml-auto nav-flex-icons">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="https://www.instagram.com/dresscode_boy/">
<i class="fab fa-instagram"></i> Instagram
</a>
</li>
</ul>
<ul class="navbar-nav ml-auto nav-flex-icons">
<li class="nav-item avatar">
<a
><img
src="https://sun9-22.userapi.com/c855736/v855736301/c2433/Ohqvc5KlTqo.jpg"
class="rounded-circle z-depth-0"
width="40px"
height="40px"
alt="avatar image"
/>
</a>
</li>
</ul>
</nav>
</nav>
<!-- конец навигационной панели -->
<div class="jumbotron3">
<section id="about">
<div class="section-content">
<div class="container">
<br><br><br>
<div class="row">
<div class="col-md-5">
<div class="about-text">
<h3>About Me</h3>
<p class="lead">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sed
blanditiis, consequuntur, soluta labore incidunt repudiandae?
In dolorum rem voluptas soluta dolore, quae autem, natus hic
numquam obcaecati aliquam, molestiae fugit!
</p>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
Quibusdam at maxime sunt, magni officia consequuntur,
voluptate cumque sint voluptatibus facilis rerum, voluptas?
Labore, ab consequuntur optio ipsum alias dolores, eius!
</p>
</div>
</div>
<div class="col-md-4">
<div id="vk_comments">
<script type="text/javascript"> VK.Widgets.Comments("vk_comments", {limit: 10, width:100, attach: "*"});
</script>
</div>
</div>
<div class="col-md-3">
<audio src="https://raw.githubusercontent.com/DressCodeBoy/Tprogramming_147_2019/master/public/audio/Devault - Sapphire.mp3" autoplay loop controls></audio>
</div>
</div>
</div>
</div>
</section>
</div>
<!-- подключение скриптов -->
<div>
<script
src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
crossorigin="anonymous"
></script>
<script
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
crossorigin="anonymous"
></script>
<script
src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"
></script>
<script src="public/js/script.js"></script>
</script>
</div>
</body>
</html>
45 changes: 45 additions & 0 deletions CourseApp.Tests/AgeTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
using System;
using Xunit;

namespace CourseApp.Tests
{
public class AgeTest
{
[Fact]
public void TestDate()
{
double a = DateTime.Now.Ticks - new DateTime(1998, 08, 04).Ticks;
double b = AgeClass.DateCompare(new DateTime(1998, 08, 04), DateTime.Now).Ticks;
if (b - a > 0.000000001)
{
Assert.True(true);
}
}

[Fact]
public void TestTodayBirthday()
{
try
{
Assert.Equal(0, DateTime.Compare(DateTime.Now, AgeClass.DateCompare(DateTime.Now, DateTime.Now)));
}
catch (Exception)
{
Console.WriteLine("Birthday == Today");
}
}

[Fact]
public void BirthdayAboveToday()
{
try
{
Assert.Equal(0, DateTime.Compare(DateTime.Now, AgeClass.DateCompare(DateTime.Now, new DateTime(2048, 8, 16))));
}
catch (Exception)
{
Console.WriteLine("Birthday > Today");
}
}
}
}
61 changes: 31 additions & 30 deletions CourseApp.Tests/PersonTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,62 @@ namespace CourseApp.Tests
public class PersonTest
{
[Fact]
public void TestConstructor()
public void TestConstructorStudent()
{
var item = new Person();
var item = new Student();
Assert.Equal(18, item.Age);
Assert.Equal("Name", item.Name);
Assert.Equal("LastName", item.LastName);
Assert.True(item.IsMale);
Assert.True(item.Starvation);
}

[Fact]
public void TestSetAge()
public void TestConstructorChildren()
{
var item = new Person();
item.Age = 30;
Assert.Equal(30, item.Age);
var item = new Children();
Assert.Equal(1, item.Age);
Assert.Equal("Name", item.Name);
Assert.Equal("LastName", item.LastName);
Assert.True(item.IsMale);
Assert.False(item.Happy);
}

[Fact]
public void TestSetAgeChildren()
{
var item = new Children();
item.Age = 9;
Assert.Equal(9, item.Age);
}

[Fact]
public void TestSetAgeStudent()
{
var item = new Student();
item.Age = 20;
Assert.Equal(20, item.Age);
}

[Fact]
public void TestIncorrectSetAge()
public void TestIncorrectSetAgeChildren()
{
try
{
var item = new Person();
var item = new Children();
item.Age = -1000;
}
catch (System.Exception)
{
Console.WriteLine("Age should be more 0 and less than 100");
Console.WriteLine("Age should be more 0 and less than 12");
Assert.True(true);
}
}

[Fact]
public void TestCorrectIncorrectSetAge()
{
var item = new Person();
var item = new Student();
item.Age = 27;
try
{
Expand All @@ -54,25 +75,5 @@ public void TestCorrectIncorrectSetAge()

Assert.Equal(27, item.Age);
}

[Fact]
public void TestIncorrectSetString()
{
var item = new Person();
item.Name = string.Empty;
item.LastName = string.Empty;
Assert.Equal(string.Empty, item.Name);
Assert.Equal(string.Empty, item.LastName);
}

[Fact]
public void TestCorrectSetString()
{
var item = new Person();
item.Name = "VikiVik";
item.LastName = "Moro";
Assert.Equal("VikiVik", item.Name);
Assert.Equal("Moro", item.LastName);
}
}
}
Loading