Skip to content

Commit 9b9ee67

Browse files
dawidbildawidbil
authored
normalizacja i ujednolicanie (#80)
* normalizacja i ujednolicanie * changes from code review
1 parent f2e3c9a commit 9b9ee67

File tree

15 files changed

+189
-59
lines changed

15 files changed

+189
-59
lines changed

‎.github/workflows/main.yml renamed to ‎.github/workflows/module1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: C++ with CMake CI
1+
name: Module 1 homework
22

33
on: [push, pull_request]
44

‎.gitignore

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
.idea/
2+
*.iml
3+
*.iws
4+
*.eml
5+
out/
6+
.DS_Store
7+
.svn
8+
log/*.log
9+
tmp/**
10+
node_modules/
11+
.sass-cache
12+
css/reveal.min.css
13+
js/reveal.min.js
14+
15+
# Prerequisites
16+
*.d
17+
18+
# Builds, test, IDE
19+
build/
20+
.vscode/
21+
googletest/
22+
23+
# Compiled Object files
24+
*.slo
25+
*.lo
26+
*.o
27+
*.obj
28+
29+
# Precompiled Headers
30+
*.gch
31+
*.pch
32+
33+
# Compiled Dynamic libraries
34+
*.so
35+
*.dylib
36+
*.dll
37+
38+
# Fortran module files
39+
*.mod
40+
*.smod
41+
42+
# Compiled Static libraries
43+
*.lai
44+
*.la
45+
*.a
46+
*.lib
47+
48+
# Executables
49+
*.exe
50+
*.out
51+
*.app

‎README.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Object Oriented Programming
2+
3+
<a href="https://coders.school">
4+
<img width="500" data-src="coders_school_logo.png" src="coders_school_logo.png" alt="Coders School" class="plain">
5+
</a>
6+
7+
## [Moduł 1](module1/)
8+
9+
### [Wprowadzenie do programowania obiektowego](module1/presentation_oop_intro.md)
10+
11+
### [Modyfikatory dostępu](module1/presentation_access_modifiers.md)
12+
13+
### [Konstruktory i destruktory](module1/presentation_ctor_dtor.md)
14+
15+
### [Hermetyzacja](module1/presentation_hermetization.md)
16+
17+
### [Zadania](module1/presentation_tasks.md)
18+
19+
### [Projekt grupowy](module1/presentation_homework.md)
20+
21+
## [Moduł 2](module2/)
22+
23+
### [Dziedziczenie](module2/presentation_inheritance.md)
24+
25+
### [Metody wirtualne, interfejsy, klasy abstrakcyjne](module2/presentation_virtual.md)
26+
27+
### [Polimorfizm](module2/presentation_polymorphism.md)
28+
29+
### [Zmienne i funkcje statyczne](module2/presentation_static.md)
30+
31+
### [Projekt grupowy](module2/presentation_homework.md)
32+
33+
## [Moduł 3](module3/)
34+
35+
### [Przykładowe rozwiązania](module3/presentation_solutions.md)
36+
37+
### [Polimorfizm](module3/presentation_polymorphism.md)
38+
39+
### [Zmienne i funkcje statyczne](module3/presentation_static.md)
40+
41+
### [Projekt grupowy](module3/presentation_homework.md)
42+
43+
## [Moduł 4](module4/)
44+
45+
### [Cztery filary obiektowości](module4/pillars.md)
46+
47+
### [Abstrakcja](module4/abstraction.md)
48+
49+
### [Enkapsulacja](module4/encapsulation.md)
50+
51+
### [Dziedziczenie](module4/inheritance.md)
52+
53+
### [Polimorfizm](module4/polymorphism.md)
54+
55+
### [Zadanie](module4/exercise_cars.md)
56+
57+
### [Post-work](module4/post_work.md)

‎module1/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
var link = document.createElement( 'link' );
2222
link.rel = 'stylesheet';
2323
link.type = 'text/css';
24-
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../css/print/paper.css';
24+
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../../css/print/paper.css';
2525
document.getElementsByTagName( 'head' )[0].appendChild( link );
2626
</script>
2727
</head>
@@ -74,8 +74,8 @@ <h3>Łukasz Ziobroń</h3>
7474

7575
## Kilka pytań
7676

77-
* <!-- .element: class="fragment fade-in" --> która z dotychczasowych lekcji była najciekawsza?
78-
* <!-- .element: class="fragment fade-in" --> która rzecz z preworku (wideo Zelenta Obiektowy C++#1) była najtrudniejsza do zrozumienia?
77+
* <!-- .element: class="fragment fade-in" --> Która z dotychczasowych lekcji była najciekawsza?
78+
* <!-- .element: class="fragment fade-in" --> Która rzecz z preworku (wideo Zelenta Obiektowy C++#1) była najtrudniejsza do zrozumienia?
7979

8080
</textarea>
8181
</section>

‎module1/presentation_hermetization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ___
1212

1313
## Hermetyzacja
1414

15-
Aby zabezpieczyć nasz obiekt, przez niepożądanymi modyfikacjami, możemy dokonać, tzw. hermetyzacji lub enkapsulacji.
15+
Aby zabezpieczyć nasz obiekt, przed niepożądanymi modyfikacjami, możemy dokonać, tzw. hermetyzacji lub enkapsulacji.
1616
<!-- .element: class="fragment fade-in" -->
1717

1818
Polega ona na umieszczeniu wszystkich właściwości (pól) w sekcji prywatnej, a ich modyfikacje umożliwiać przez publiczne funkcje.

‎module1/presentation_homework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ___
3030

3131
### Pre-work
3232

33-
* Poczytaj pooglądaj wideo o dziedziczeniu i polimorfiźmie
33+
* Poczytaj i pooglądaj wideo o dziedziczeniu i polimorfizmie
3434

3535
___
3636

‎module2/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
var link = document.createElement( 'link' );
2222
link.rel = 'stylesheet';
2323
link.type = 'text/css';
24-
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../css/print/paper.css';
24+
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../../css/print/paper.css';
2525
document.getElementsByTagName( 'head' )[0].appendChild( link );
2626
</script>
2727
</head>

‎module2/presentation_inheritance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ struct Hummingbird : public Bird {
347347
};
348348
```
349349
350-
Jeszcze bardziej utrudnimy sytuacje, gdy w przyszłości dodamy sobie kolejne klasy jak Struś. Zawsze przed implementacją musimy się zastanowić jak podzielić odpowiedzialność na poszczególne klasy, aby
350+
Jeszcze bardziej utrudnimy sytuację, gdy w przyszłości dodamy sobie kolejne klasy jak Struś. Zawsze przed implementacją musimy się zastanowić jak podzielić odpowiedzialność na poszczególne klasy, aby
351351
uniknąć podobnych problemów.
352352
353353
___

‎module2/presentation_static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main() {
4040
```
4141
<!-- .element: class="fragment fade-in" -->
4242

43-
Nawet jeżeli obiekt zajmowałby dużo miejsca w pamięci a my chcielibyśmy tylko jego nazwę i tak musimy go utworzyć, ponieważ tylko na nim możemy zawołać metodę `getName()`.
43+
Nawet jeżeli obiekt zajmowałby dużo miejsca w pamięci, a my chcielibyśmy tylko jego nazwę i tak musimy go utworzyć, ponieważ tylko na nim możemy zawołać metodę `getName()`.
4444
<!-- .element: class="fragment fade-in" -->
4545

4646
___

‎module3/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
var link = document.createElement( 'link' );
2222
link.rel = 'stylesheet';
2323
link.type = 'text/css';
24-
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../css/print/paper.css';
24+
link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../../css/print/paper.css';
2525
document.getElementsByTagName( 'head' )[0].appendChild( link );
2626
</script>
2727
</head>

‎module4/agenda.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎module4/cover.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎module4/index.html

Lines changed: 67 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,103 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
66

7-
<title>Object-oriented C++</title>
7+
<title>Object Oriented Programming - Coders School</title>
88

9-
<meta name="description" content="C++11, C++14 and C++17 presentation">
10-
<meta name="author" content="Lukasz Ziobron">
9+
<meta name="description" content="OOP">
10+
<meta name="author" content="Łukasz Ziobroń">
1111

12-
<link rel="stylesheet" href="../css/reset.css">
13-
<link rel="stylesheet" href="../css/reveal.css">
14-
<link rel="stylesheet" href="../css/theme/coders.css" id="theme">
12+
<link rel="stylesheet" href="../../css/reset.css">
13+
<link rel="stylesheet" href="../../css/reveal.css">
14+
<link rel="stylesheet" href="../../css/theme/coders.css" id="theme">
1515

1616
<!-- Theme used for syntax highlighting of code -->
17-
<link rel="stylesheet" href="../lib/css/monokai.css">
17+
<link rel="stylesheet" href="../../lib/css/monokai.css">
1818

1919
<!-- Printing and PDF exports -->
2020
<script>
2121
var link = document.createElement('link');
2222
link.rel = 'stylesheet';
2323
link.type = 'text/css';
24-
link.href = window.location.search.match(/print-pdf/gi) ? 'css/print/pdf.css' : 'css/print/paper.css';
24+
link.href = window.location.search.match(/print-pdf/gi) ? '../../css/print/pdf.css' : '../../css/print/paper.css';
2525
document.getElementsByTagName('head')[0].appendChild(link);
2626
</script>
2727
</head>
2828
<body>
2929

3030
<div class="reveal">
3131
<div class="slides">
32-
<section data-markdown="../md.object_oriented/cover.md" data-separator-vertical="^___"
33-
data-separator-notes="^Note:">
34-
</section>
35-
<section data-markdown="../md.object_oriented/agenda.md" data-separator-vertical="^___"
36-
data-separator-notes="^Note:">
37-
</section>
38-
<section data-markdown="../md.object_oriented/pillars.md" data-separator-vertical="^___"
32+
<section>
33+
<section data-background="#111111">
34+
35+
<h1>OOP #4</h1>
36+
<h2>Object-Oriented Programming #4</h2>
37+
<a href="https://coders.school">
38+
<img width="500" data-src="../coders_school_logo.png" alt="Coders School" class="plain">
39+
</a>
40+
<h3>Łukasz Ziobroń</h3>
41+
42+
</section>
43+
<section data-markdown>
44+
<textarea data-template>
45+
46+
## Agenda
47+
48+
1. <!-- .element: class="fragment fade-in" --> 4 pillars of objectivity
49+
2. <!-- .element: class="fragment fade-in" --> Abstraction
50+
3. <!-- .element: class="fragment fade-in" --> Encapsulation
51+
4. <!-- .element: class="fragment fade-in" --> Inheritance
52+
5. <!-- .element: class="fragment fade-in" --> Polymorphism
53+
54+
</textarea>
55+
</section>
56+
</section>
57+
<!--
58+
Note that Windows uses `\r\n` instead of `\n` as its linefeed character.
59+
For a regex that supports all operating systems, use `\r?\n` instead of `\n`.
60+
61+
Usage:
62+
Install dependencies
63+
64+
$ npm install
65+
Serve the presentation and monitor source files for changes
66+
67+
$ npm start
68+
Open http://localhost:8000 to view your presentation
69+
70+
You can change the port by using npm start -- --port=8001.
71+
-->
72+
<section data-markdown="pillars.md" data-separator-vertical="^___"
3973
data-separator-notes="^Note:">
4074
</section>
41-
<section data-markdown="../md.object_oriented/abstraction.md" data-separator-vertical="^___"
75+
<section data-markdown="abstraction.md" data-separator-vertical="^___"
4276
data-separator-notes="^Note:">
4377
</section>
44-
<section data-markdown="../md.object_oriented/encapsulation.md" data-separator-vertical="^___"
78+
<section data-markdown="encapsulation.md" data-separator-vertical="^___"
4579
data-separator-notes="^Note:">
4680
</section>
47-
<section data-markdown="../md.object_oriented/inheritance.md" data-separator-vertical="^___"
81+
<section data-markdown="inheritance.md" data-separator-vertical="^___"
4882
data-separator-notes="^Note:">
4983
</section>
50-
<section data-markdown="../md.object_oriented/polymorphism.md" data-separator-vertical="^___"
84+
<section data-markdown="polymorphism.md" data-separator-vertical="^___"
5185
data-separator-notes="^Note:">
5286
</section>
53-
<section data-markdown="../md.object_oriented/exercise_cars.md" data-separator-vertical="^___"
87+
<section data-markdown="exercise_cars.md" data-separator-vertical="^___"
5488
data-separator-notes="^Note:">
5589
</section>
56-
<section data-markdown="../md.object_oriented/post_work.md" data-separator-vertical="^___"
90+
<section data-markdown="post_work.md" data-separator-vertical="^___"
5791
data-separator-notes="^Note:">
5892
</section>
59-
<section data-markdown data-background="#111111">
60-
<!-- Added ending slide -->
61-
# The End &#128522 !
62-
</section>
93+
<section data-background="#111111">
94+
95+
<h1>Coders School</h1>
96+
<img width="400" data-src="../logo.png" alt="Coders School" class="plain">
97+
98+
</section>
6399
</div>
64100

65101
</div>
66102

67-
<script src="../js/reveal.js"></script>
103+
<script src="../../js/reveal.js"></script>
68104

69105
<script>
70106
// More info about config & dependencies:
@@ -77,11 +113,11 @@
77113
hash: true,
78114
pdfSeparateFragments: false,
79115
dependencies: [
80-
{ src: '../plugin/externalcode/externalcode.js', condition: function() { return !!document.querySelector( '[data-code]' ); } },
81-
{ src: '../plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
82-
{ src: '../plugin/markdown/marked.js' },
83-
{ src: '../plugin/markdown/markdown.js' },
84-
{ src: '../plugin/notes/notes.js', async: true }
116+
{ src: '../../plugin/externalcode/externalcode.js', condition: function() { return !!document.querySelector( '[data-code]' ); } },
117+
{ src: '../../plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
118+
{ src: '../../plugin/markdown/marked.js' },
119+
{ src: '../../plugin/markdown/markdown.js' },
120+
{ src: '../../plugin/notes/notes.js', async: true }
85121
]
86122
});
87123
</script>

‎module4/pillars.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
# The four pillars of objectivity
44

5+
___
6+
7+
## The four pillars of objectivity
8+
59
* <!-- .element: class="fragment fade-in" --> Abstraction
610
* <!-- .element: class="fragment fade-in" --> Encapsulation
711
* <!-- .element: class="fragment fade-in" --> Inheritance

‎shm/check.sh

100755100644
File mode changed.

0 commit comments

Comments
 (0)