Skip to content

Commit 31a97de

Browse files
adymitrukadymitruk
committed
moved to .net 7
1 parent b89531e commit 31a97de

File tree

10 files changed

+131
-116
lines changed

10 files changed

+131
-116
lines changed

‎.idea/.idea.TimeTrackingCS/.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.TimeTrackingCS/.idea/codeStyles/codeStyleConfig.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.TimeTrackingCS/.idea/indexLayout.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.TimeTrackingCS/.idea/jsLibraryMappings.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ConsoleTimeTracking/ConsoleTimeTracking.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎ConsoleTimeTracking/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public TokenTree(IEnumerator<string> tokenEnumerator, string rangeName) : base(r
104104
var accumulateEmpty = false;
105105
Empty = "";
106106
while (tokenEnumerator.MoveNext())
107-
if (RangeIdentified()) _tokenItems.Add(new TokenTree(tokenEnumerator, tokenEnumerator.Current));
107+
if (RangeIdentified()) _tokenItems.Add(new TokenTree(tokenEnumerator, tokenEnumerator.Current));
108108
else if (EndOfRangeIdentified()) return;
109109
else if (EmptinessIdentified()) accumulateEmpty = true;
110110
else if (accumulateEmpty) Empty += tokenEnumerator.Current;
111-
else _tokenItems.Add(new TokenItem(tokenEnumerator.Current));
111+
else _tokenItems.Add(new TokenItem(tokenEnumerator.Current));
112112

113113
bool EndOfRangeIdentified() { return Regex.Matches(tokenEnumerator.Current!, @"{{ end }}").Count == 1; }
114114
bool EmptinessIdentified() { return Regex.Matches(tokenEnumerator.Current!, @"{{ if-nothing }}").Count == 1; }

‎ConsoleTimeTracking/layout/css/style.css

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
* { font-family: "Roboto Light", sans-serif; }
2+
body {
3+
background-color: aliceblue;
4+
padding: 0;
5+
}
6+
header {
7+
position: fixed;
8+
top: 0;
9+
left: 0;
10+
right: 0;
11+
background-color: aliceblue;
12+
background-clip: border-box;
13+
margin: 0;
14+
padding: 20px;
15+
box-shadow: rgba(0, 0, 0, 0.1) 0 5px 10px 0;
16+
}
17+
nav {
18+
justify-self: right;
19+
position: sticky;
20+
display: flex;
21+
padding: 0;
22+
flex-wrap: nowrap;
23+
background-color: aliceblue;
24+
}
25+
nav > a {
26+
border: 1px grey solid;
27+
text-decoration: none;
28+
padding: 15px 25px;
29+
text-align: center;
30+
background-color: lightblue;
31+
color: black;
32+
flex-shrink: 0;
33+
}
34+
main {
35+
background-color: aliceblue;
36+
display: flex;
37+
flex-direction: column;
38+
align-items: center;
39+
}
40+
.below-header { margin-top: 200px; }
41+
.sections {
42+
background-color: white;
43+
display: flex;
44+
flex-direction: column;
45+
margin-left: 0;
46+
margin-right: 0;
47+
padding: 10px;
48+
max-width: 1000px;
49+
align-self: center;
50+
}
51+
.section {
52+
padding: 0;
53+
margin: 0;
54+
background-color: white;
55+
}
56+
#time-area {
57+
display: flex;
58+
justify-content: space-evenly;
59+
flex-flow: wrap;
60+
background-color: white;
61+
}
62+
.time-section {
63+
padding: 15px 15px;
64+
margin: 5px 5px 5px 5px;
65+
background-color: aliceblue;
66+
/*box-shadow: 5px 5px 20px -10px;*/
67+
min-width: 150px;
68+
flex: 1;
69+
}
70+
.entry {
71+
background-color: lightblue;
72+
padding: 2px;
73+
margin: 2px;
74+
}
75+
h5 { margin: 10px; }
76+
#project-label { grid-area: project-label }
77+
#project { grid-area: project }
78+
#date-label { grid-area: date-label }
79+
#date { grid-area: date }
80+
#time-label { grid-area: time-label }
81+
#hour { grid-area: hour }
82+
#time-separator { grid-area: time-separator }
83+
#minute { grid-area: minute }
84+
#duration-label { grid-area: duration-label }
85+
#duration { grid-area: duration }

‎ConsoleTimeTracking/layout/log-time.html

+20-112
Original file line numberDiff line numberDiff line change
@@ -3,98 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>Log Time</title>
6-
<style>
7-
* {
8-
font-family: "Roboto Light", sans-serif;
9-
}
10-
11-
body {
12-
background-color: aliceblue;
13-
padding: 0;
14-
}
15-
16-
header {
17-
position: fixed;
18-
top: 0;
19-
left: 0;
20-
right: 0;
21-
background-color: aliceblue;
22-
background-clip: border-box;
23-
margin: 0;
24-
padding: 20px;
25-
box-shadow: rgba(0, 0, 0, 0.1) 0 5px 10px 0;
26-
}
27-
28-
nav {
29-
justify-self: right;
30-
position: sticky;
31-
display: flex;
32-
padding: 0;
33-
flex-wrap: nowrap;
34-
background-color: aliceblue;
35-
}
36-
37-
nav > a {
38-
border: 1px grey solid;
39-
text-decoration: none;
40-
padding: 15px 25px;
41-
text-align: center;
42-
background-color: lightblue;
43-
color: black;
44-
flex-shrink: 0;
45-
}
46-
47-
main {
48-
background-color: aliceblue;
49-
display: flex;
50-
flex-direction: column;
51-
align-items: center;
52-
}
53-
.below-header {
54-
margin-top: 200px;
55-
}
56-
.sections {
57-
background-color: white;
58-
display: flex;
59-
flex-direction: column;
60-
margin-left: 0;
61-
margin-right: 0;
62-
padding: 10px;
63-
max-width: 1000px;
64-
align-self: center;
65-
}
66-
67-
.section {
68-
padding: 0;
69-
margin: 0;
70-
background-color: white;
71-
}
72-
73-
#time-area {
74-
display: flex;
75-
justify-content: space-evenly;
76-
flex-flow: wrap;
77-
background-color: white;
78-
}
79-
80-
.time-section {
81-
padding: 15px 15px;
82-
margin: 5px 5px 5px 5px;
83-
background-color: aliceblue;
84-
/*box-shadow: 5px 5px 20px -10px;*/
85-
min-width: 150px;
86-
flex: 1;
87-
}
88-
.entry {
89-
background-color: lightblue;
90-
padding: 2px;
91-
margin: 2px;
92-
}
93-
94-
h5 {
95-
margin: 10px;
96-
}
97-
</style>
6+
<link href="css/style.css" rel="stylesheet"/>
987
</head>
998
<body>
1009
<header>
@@ -144,26 +53,25 @@ <h5>Earlier Today:</h5>
14453
<h5>Please Enter in your time:</h5>
14554

14655
<form action="/log-time.html" method="post">
147-
<div>
148-
<label>Date:
149-
<input name="date" type="text" value=""/>
150-
</label><br/>
151-
<label>Hour:
152-
<input name="hour" type="text" value=""/>
153-
</label><br/>
154-
<label>Min:
155-
<input name="minute" type="text" value=""/>
156-
</label><br/>
157-
<label>Hours:
158-
<input name="total-hours" type="text" value=""/>
159-
</label><br/>
160-
<label>Project:
161-
<input name="project" type="text" value=""/>
162-
</label>
163-
</div>
164-
<div class="columns">
165-
<div class="column is-one-third">
166-
<input class="button " type="submit" value="log time"></div>
56+
<div id="time-grid">
57+
<div id="date-label"><label for="hour">Date:</label></div>
58+
<div id="date"><input name="date" type="text"/></div>
59+
<div id="hour"><label>Hour:<input name="hour" type="text" value=""/>
60+
</label><br/>
61+
<label>Min:
62+
<input name="minute" type="text" value=""/>
63+
</label><br/>
64+
<label>Hours:
65+
<input name="total-hours" type="text" value=""/>
66+
</label><br/>
67+
<label>Project:
68+
<input name="project" type="text" value=""/>
69+
</label>
70+
</div>
71+
<div class="columns">
72+
<div class="column is-one-third">
73+
<input class="button " type="submit" value="log time"></div>
74+
</div>
16775
</div>
16876
</form>
16977
</div>

‎TimeTrackingCS.sln.DotSettings.user

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">INFO</s:String></wpf:ResourceDictionary>

‎global.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "7.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
6+
}
7+
}

0 commit comments

Comments
 (0)