Skip to content

Commit d185a6f

Browse files
authored
Merge pull request #48 from dzcode-io/32-develop-learn-scene
32 develop learn scene
2 parents 5945769 + a2430e1 commit d185a6f

File tree

23 files changed

+556
-38
lines changed

23 files changed

+556
-38
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"title": "Advanced Git"
3+
}
Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,54 @@
1-
Content coming soon...
1+
# Bing Daily Wallpaper
2+
3+
[![](https://img.shields.io/npm/v/bing-daily-wallpaper-cross-platform)](https://www.npmjs.com/package/bing-daily-wallpaper-cross-platform)
4+
[![](https://img.shields.io/npm/dm/bing-daily-wallpaper-cross-platform)](https://www.npmjs.com/package/bing-daily-wallpaper-cross-platform)
5+
6+
Set Bing image of the day as your desktop wallpaper daily
7+
8+
## Get Started
9+
10+
### Perquisites
11+
12+
Make sure you have:
13+
14+
- [NodeJS](https://nodejs.org/) 10 or higher
15+
- [NPM](https://www.npmjs.com/) or [Yarn](https://yarnpkg.com/)
16+
17+
### Setup
18+
19+
install via NPM:
20+
21+
```terminal
22+
npm i -g bing-daily-wallpaper-cross-platform
23+
```
24+
25+
Or install via Yarn:
26+
27+
```terminal
28+
yarn global add bing-daily-wallpaper-cross-platform
29+
```
30+
31+
### Run
32+
33+
To set the latest bing daily image as your desktop wallpaper simply run:
34+
35+
```terminal
36+
bdw
37+
```
38+
39+
and you're all set.
40+
41+
## Contributing
42+
43+
To get started see [the contributing guidelines](https://github.com/ZibanPirate/bing-daily-wallpaper/blob/master/.github/CONTRIBUTING.md).
44+
45+
## Todos
46+
47+
- [x] Cross-platform support (MacOS, Linux, Windows)
48+
- [ ] More than 90% test coverage
49+
- [ ] Update wallpaper automatically each day
50+
- [ ] Electron App for non-programmers
51+
52+
## License
53+
54+
Copyright (c) 2020 Zakaria Mansouri (twitter: [@zibanpirate](https://twitter.com/zibanpirate)) Licensed under the MIT license.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"title": "Collaboration Scenarios",
2+
"title": "Collaboration",
33
"description": "Description coming soon",
44
"image": "https://images.unsplash.com/photo-1481487196290-c152efe083f5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=800&q=100"
55
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"title": "Git Basics"
3+
}

data/documentation/list.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
22
"items": [
33
"Getting_Started",
4+
"Git_Basics",
45
"Git_Basics/Git_and_Github",
56
"Git_Basics/Basic_Git_Commands",
67
"Git_Basics/Managing_Conflict",
78
"Git_Basics/Collaboration_Scenarios",
9+
"Advanced_Git_Commands",
810
"Advanced_Git_Commands/Git_Reflog",
911
"Advanced_Git_Commands/Git_Clean",
1012
"Advanced_Git_Commands/Git_Rebase"

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"pug-loader": "^2.4.0",
8282
"react": "^16.13.1",
8383
"react-dom": "^16.13.1",
84+
"react-markdown": "^4.3.1",
8485
"react-redux": "^7.2.0",
8586
"react-router-dom": "^5.1.2",
8687
"redux": "^4.0.5",

frontend/src/apps/main/components/navbar/index.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ interface NavigationLink {
99
}
1010

1111
interface Props {
12-
navitems: NavigationLink[];
12+
navItems: NavigationLink[];
1313
}
1414

15-
export const Navbar: React.FC<Props> = ({ navitems }) => {
16-
const [isOpen, setOpen] = useState("open");
15+
export const Navbar: React.FC<Props> = ({ navItems }) => {
16+
const [isOpen, setIsOpen] = useState(true);
1717
const navToggle = () => {
18-
isOpen === "" ? setOpen("open") : setOpen("");
18+
setIsOpen(!isOpen);
1919
};
2020

2121
return (
2222
<nav className="Navbar">
2323
<Link className="brand" to="/">
24-
Dzcode.io
24+
dzCode.io
2525
</Link>
2626
<div className="Navbar__burger" onClick={navToggle}>
2727
<div className="burger__button" />
2828
</div>
29-
<div className={`Navbar__list ${isOpen}`}>
30-
{navitems.map((navitem: NavigationLink) => {
29+
<div className={`Navbar__list ${isOpen && "open"}`}>
30+
{navItems.map((navItem: NavigationLink) => {
3131
return (
3232
<NavLink
3333
className="navLink"
3434
activeClassName="Navbar__link--active"
35-
key={navitem.id}
36-
to={navitem.to}
35+
key={navItem.id}
36+
to={navItem.to}
3737
>
38-
{navitem.name}
38+
{navItem.name}
3939
</NavLink>
4040
);
4141
})}

frontend/src/apps/main/components/navbar/style.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.Navbar {
44
width: 100%;
55
padding: 0 10%;
6+
height: $navbar-height;
67
display: flex;
78
flex-direction: row;
89
justify-content: space-between;
@@ -15,6 +16,7 @@
1516
position: fixed;
1617
top: 0;
1718
right: 0;
19+
border-bottom: #d4d4d3 solid 1px;
1820
.brand {
1921
font-size: 1rem;
2022
color: text-primary;

frontend/src/apps/main/entry/index.pug

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ head(lang="{|language code|}")
2222
s.parentNode.insertBefore(t,s)}(window, document,'script','https://connect.facebook.net/en_US/fbevents.js');
2323
fbq('init', "#{fbpCode}");
2424
fbq('track', 'PageView');
25+
//- Facebook Comments plugin
26+
meta(property="fb:app_id" content=fbAppCode)
2527

2628
meta(charset='utf-8')
2729
meta(http-equiv='X-UA-Compatible' content='IE=edge')
@@ -40,3 +42,5 @@ head(lang="{|language code|}")
4042

4143
body
4244
div#app-container
45+
46+
script(async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v5.0")

frontend/src/apps/main/entry/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ const Learn = lazy(() => import("t9/apps/main/scenes/learn"));
1414

1515
// Temp data: Todo: replace with props from the store
1616

17-
const navitems = [
18-
{ id: 1, to: "/learn", name: "Learn" },
19-
{ id: 2, to: "/getstarted", name: "Get Started" },
20-
{ id: 3, to: "/gitgithub", name: "Git & Github" },
17+
const navItems = [
18+
{ id: 1, to: "/Learn/Getting_Started", name: "Learn" },
19+
{ id: 2, to: "/", name: "Contribute" },
20+
{ id: 3, to: "/", name: "Projects" },
2121
{ id: 4, to: "/articles", name: "Articles" },
2222
];
2323

2424
export const App: React.SFC<{}> = () => {
2525
return (
2626
<BrowserRouter>
27-
<Navbar navitems={navitems} />
27+
<Navbar navItems={navItems} />
2828
<Suspense fallback={Loading}>
2929
<Switch>
3030
<Route path="/" exact={true} component={Landing} />

0 commit comments

Comments
 (0)