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

Feature/developer dark merged #95

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5dff601
Merge pull request #72 from skynethubio/feature/developer-dark-merged
skynethubio May 9, 2021
5b56371
http://localhost:3000/#/stats and http://localhost:3000/#/nodomain is…
QurbanKhan May 11, 2021
1d9522a
http://localhost:3000/#/descoverdev issue solve
QurbanKhan May 11, 2021
25275b7
http://localhost:3000/#/submitapp issue solve
QurbanKhan May 11, 2021
c6dbfd0
http://localhost:3000/#/installedapps issue solve
QurbanKhan May 11, 2021
35bc441
http://localhost:3000/#/apps issue solve
QurbanKhan May 11, 2021
906ae65
http://localhost:3000/#/submitsite and http://localhost:3000/#/hostin…
QurbanKhan May 11, 2021
f6607b6
http://localhost:3000/#/submitsite issue complete solve
QurbanKhan May 12, 2021
21f77ce
Both form fields showing green border
QurbanKhan May 12, 2021
9e44eef
Dark selected chip show green color
QurbanKhan May 12, 2021
51e3b9e
Create spacing between card except mobile screen and zoom out effect …
QurbanKhan May 12, 2021
f7fed66
Add announcement bar in top of website with light and dark mode
QurbanKhan May 12, 2021
7d5eb85
Issue 37 solve Announcement bar close onclick right arrow icon
QurbanKhan May 14, 2021
32a6175
#67 issue complete and some changes in #37 issue and this issue also …
QurbanKhan May 14, 2021
ed8e111
Merge remote-tracking branch 'origin/feature/jazz' into feature/devel…
skynethubio May 18, 2021
1f9c72e
All issue solve except user settings and user preferences
QurbanKhan May 18, 2021
b8bb795
syntax fix
skynethubio May 18, 2021
a6132a8
Merge remote-tracking branch 'origin/feature/jazz' into feature/devel…
skynethubio May 18, 2021
45c0712
AppCard Fix
skynethubio May 18, 2021
74e16d2
Issue solve except little bit
QurbanKhan May 19, 2021
ed2df1c
login changes
skynethubio May 20, 2021
6d94c28
Merge remote-tracking branch 'origin/feature/jazz' into feature/devel…
skynethubio May 20, 2021
2d26a7c
Issue 37 solve
QurbanKhan May 20, 2021
d5b509d
Merge remote-tracking branch 'origin/feature/jazz' into feature/devel…
skynethubio May 20, 2021
713a7f0
All issues done except issue 48
QurbanKhan May 20, 2021
036ad4b
Setting done
QurbanKhan May 20, 2021
a16656c
Grid change in AppsList.js and change some styling
QurbanKhan May 20, 2021
1b3b540
Issue 48 complete
QurbanKhan May 22, 2021
fd33132
Issue 68 solve (submit app and submit site dropdown color fix in dark…
QurbanKhan May 22, 2021
66e7d12
Now fix issue 68
QurbanKhan May 23, 2021
3e2b08e
issue 59 solve
QurbanKhan May 23, 2021
df63406
more changes related to login and domain
skynethubio May 24, 2021
a4fae86
dark mode remaining changes
skynethubio May 24, 2021
4d737c9
more changes
skynethubio Sep 20, 2021
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
2 changes: 1 addition & 1 deletion .eslintcache

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome localhost",
"url": "http://localhost:3002",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
}
]
Expand Down
56 changes: 53 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"redux": "^4.0.5",
"redux-observable": "^1.2.0",
"rxjs": "^6.6.3",
"skynet-js": "^4.0.6-beta",
"skynet-js": "^4.0.8-beta",
"slick-carousel": "^1.8.1",
"social-dac-library": "^0.2.3",
"tweetnacl": "^1.0.3",
Expand Down
23 changes: 18 additions & 5 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ThemeProvider } from "@material-ui/core";
import React, { useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { useDispatch, useSelector} from "react-redux";
import { HashRouter as Router } from "react-router-dom";
import Nav from "./components/Navbar/Nav";
import Sidebar from "./components/Sidebar/Sidebar";
Expand All @@ -13,24 +13,37 @@ import { skappTheme } from "./theme/Theme";

function App() {
const [toggle, setToggle] = useState(false);
const [isLoggedIn, setIsLoggedIn] = useState(false);
const dispatch = useDispatch();
const userSession = useSelector((state) => state.userSession)

useEffect(() => {
initMySky().then((data) => {
if (data && data.loggedIn)
// only if login is true set session
console.log("### MySky Session Initialized Successfully !!");
if (data)
dispatch(setUserSession(data.userSession));
});
}, [dispatch]);
}, []);

useEffect(() => {
if(userSession?.mySky)
{
userSession.mySky.checkLogin().then((loginStatus)=>{
setIsLoggedIn(loginStatus)
})
}
}, [userSession]);
return (
<Router>
<ThemeProvider theme={skappTheme}>
<SnLoader />
<div className="App">
<Nav toggle={toggle} setToggle={setToggle} />
<section className="main-content">
{isLoggedIn ?
<aside className="app-sidebar">
<Sidebar toggle={toggle} />
</aside>
</aside> : null}
<main className="app-content" id="app-content">
<SnRouter toggle={toggle} />
</main>
Expand Down
1 change: 1 addition & 0 deletions src/assets/img/icons/discordGreen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions src/assets/img/icons/moon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/img/icons/rightArrowGreen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions src/assets/img/icons/sun.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/img/icons/website-maintenance.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading