Skip to content

Commit eeb55fd

Browse files
committed
part11 new material
1 parent d501c29 commit eeb55fd

File tree

5 files changed

+92
-16
lines changed

5 files changed

+92
-16
lines changed

src/components/InfoBanner3.js

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
import React from 'react';
2+
3+
const InfoBanner = ({ visible, onHide }) => {
4+
if (!visible) return null;
5+
6+
const style = {
7+
padding: 10,
8+
borderStyle: 'solid',
9+
borderWidth: 2,
10+
marginLeft: 80,
11+
marginRight: 80,
12+
position: 'sticky',
13+
top: 100,
14+
left: 40,
15+
display: 'flex',
16+
flexWrap: 'wrap',
17+
flexDirection: 'row',
18+
alignContent: 'space-between',
19+
backgroundColor: 'var(--color-background)',
20+
zIndex: 2147483647,
21+
};
22+
23+
const linkStyle = {
24+
color: 'grey',
25+
textDecoration: 'underline',
26+
};
27+
28+
const textStyle = {
29+
flex: 90,
30+
};
31+
32+
const buttonDiv = {
33+
flex: 10,
34+
textAlign: 'right',
35+
};
36+
37+
const buttonStyle = {
38+
outline: 'none',
39+
backgroundColor: 'transparent',
40+
border: 'none',
41+
color: 'var(--color-text)',
42+
cursor: 'pointer',
43+
};
44+
45+
return (
46+
<div style={style}>
47+
<div style={textStyle}>
48+
<div style={{ marginBottom: 20 }}>
49+
<div style={{ marginBottom: 10 }}>
50+
Material of Part 11 has been moved to <a style={linkStyle} href="https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration">https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration</a>
51+
</div>
52+
<div style={{ marginBottom: 10 }}>
53+
The content and exercises are still same, there is a change how exercises are submitted.
54+
</div>
55+
<div>
56+
The old content is still found <a style={linkStyle} href="https://github.com/fullstack-hy2020/fullstack-hy2020.github.io/tree/7599b17c02b056fcad4f12d8708f0e07980b7564/src/content/11">here</a>.
57+
</div>
58+
</div>
59+
</div>
60+
<div style={buttonDiv}>
61+
<button style={buttonStyle} onClick={onHide}>
62+
x
63+
</button>
64+
</div>
65+
</div>
66+
);
67+
};
68+
69+
export default InfoBanner;

src/components/layout.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ import { useTranslation } from 'react-i18next';
77
import Header from './Header/Header';
88
import InfoBanner from './InfoBanner';
99
import InfoBanner2 from './InfoBanner2';
10+
import InfoBanner3 from './InfoBanner3';
1011
import Footer from './Footer/Footer';
1112
import PropTypes from 'prop-types';
1213
import SkipToContent from './SkipToContent/SkipToContent';
1314

1415
const BANNER_TO_KEY = 'part_13_changes';
1516
const BANNER2_TO_KEY = 'part_12_changes';
17+
const BANNER3_TO_KEY = 'part_11_changes';
1618

1719
const Layout = (props) => {
1820
const { i18n } = useTranslation();
@@ -22,6 +24,7 @@ const Layout = (props) => {
2224

2325
const [visible, setVisible] = useState(false);
2426
const [visible2, setVisible2] = useState(false);
27+
const [visible3, setVisible3] = useState(false);
2528

2629
useEffect(() => {
2730
const key = localStorage.getItem(BANNER_TO_KEY);
@@ -39,6 +42,14 @@ const Layout = (props) => {
3942
}
4043
}, []);
4144

45+
useEffect(() => {
46+
const key = localStorage.getItem(BANNER3_TO_KEY);
47+
if (!key) {
48+
const relevant = window.location.href.includes('en/part11') || window.location.href.includes('osa11');
49+
setVisible3(relevant);
50+
}
51+
}, []);
52+
4253
const hideNote = () => {
4354
console.log('hideNote');
4455
localStorage.setItem(BANNER_TO_KEY, 'yes');
@@ -51,6 +62,12 @@ const Layout = (props) => {
5162
setVisible2(false);
5263
};
5364

65+
const hideNote3 = () => {
66+
console.log('hideNote');
67+
localStorage.setItem(BANNER3_TO_KEY, 'yes');
68+
setVisible3(false);
69+
};
70+
5471
return (
5572
<div className="main-wrapper">
5673
<SkipToContent isCoursePage={isCoursePage} />
@@ -61,6 +78,8 @@ const Layout = (props) => {
6178

6279
<InfoBanner2 onHide={() => hideNote2()} visible={visible2} />
6380

81+
<InfoBanner3 onHide={() => hideNote3()} visible={visible3} />
82+
6483
<main id="main-content">{children}</main>
6584

6685
{!hideFooter && <Footer lang={siteLanguage} />}

src/content/11/en/part11.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ lang: en
66

77
<div class="intro">
88

9-
So you have a fresh feature ready to be shipped. What happens next? Do you upload files to a server manually? How do you manage the version of your product running in the wild? How do you make sure it works, and roll back to a safe version if it doesn’t?
10-
11-
Doing all the above manually is a pain and doesn’t scale well for a larger team. That’s why we have Continuous Integration / Continuous Delivery systems, in short CI/CD systems. In this part, you will gain an understanding of why you should use a CI/CD system, what can one do for you, and how to get started with GitHub Actions which is available to all GitHub users by default.
12-
13-
This module was crafted by the Engineering Team at Smartly.io. At Smartly.io, we automate every step of social advertising to unlock greater performance and creativity. We make every day of advertising easy, effective, and enjoyable for more than 650 brands worldwide, including eBay, Uber, and Zalando. We are one of the early adopters of GitHub Actions in wide-scale production use. Contributors: [Anna Osipova](https://www.linkedin.com/in/a-osipova/), [Anton Rautio](https://www.linkedin.com/in/anton-rautio-768190145/), [Mircea Halmagiu](https://www.linkedin.com/in/mhalmagiu/), [Tomi Hiltunen](https://www.linkedin.com/in/tomihiltunen/).
14-
15-
<i>Part updated 19th March 2024</i>
16-
- <i>Added info on using Playwright for the End to end -tests</i>
9+
Material of this part has been moved to <a href="https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration">https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration</a>
1710

1811
</div>
12+

src/content/11/fi/osa11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ lang: fi
66

77
<div class="intro">
88

9-
Kurssin yhdestoista, CI/CD:tä käsittelevä osa löytyy [englanninkielisestä kurssimateriaalista](/en/part11).
9+
Osan materiaali siirtynyt osoitteeseen <a href="https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration">https://courses.mooc.fi/org/uh-cs/courses/full-stack-open-continuous-integration</a>
1010

1111
</div>

src/content/partnavigation/partnavigation.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,7 @@ module.exports = {
134134
c: 'Communicating with server',
135135
d: 'Testing and extending our application',
136136
},
137-
11: {
138-
a: 'Introduction to CI/CD',
139-
b: 'Getting started with GitHub Actions',
140-
c: 'Deployment',
141-
d: 'Keeping green',
142-
e: 'Expanding Further',
143-
},
137+
11: {},
144138
12: {},
145139
13: {},
146140
},

0 commit comments

Comments
 (0)