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

Feedback #1

Open
wants to merge 25 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e509cc0
Setting up GitHub Classroom Feedback
github-classroom[bot] Jul 3, 2022
c2b8a99
First Commit
Onur-Morkoc Jul 5, 2022
56c9b24
First Commit
Onur-Morkoc Jul 5, 2022
08ee943
First Commit
Onur-Morkoc Jul 5, 2022
632616e
First Commit
Onur-Morkoc Jul 5, 2022
ca9462a
Sidebar skeleton created
Onur-Morkoc Jul 5, 2022
09a909c
Page layout set
Onur-Morkoc Jul 7, 2022
cd435a5
Edited html, added classes, added react-icon library, created array f…
Onur-Morkoc Jul 7, 2022
1182ec5
css added
Onur-Morkoc Jul 7, 2022
37529d6
Added react-icons and react-router-dom libraries
Onur-Morkoc Jul 7, 2022
03d9e65
Menu Component Created
Onur-Morkoc Jul 7, 2022
063c446
CSS Were Written For Menu Items
Onur-Morkoc Jul 7, 2022
ab8dbc7
Edited in HTML SideBarMenu Component Added
Onur-Morkoc Jul 7, 2022
501fcf2
CSS were written for SideBar Component
Onur-Morkoc Jul 7, 2022
ee721b8
Logout Imported to SideBarMenu
Onur-Morkoc Jul 7, 2022
4c7e056
Logout color changed
Onur-Morkoc Jul 7, 2022
d79c632
CSS Edits Done
Onur-Morkoc Jul 7, 2022
7fb8bec
first commit
aslanbekirburak Jul 13, 2022
863ef77
Add files via upload
aslannburrcu Jul 13, 2022
56a36e9
Merge branch 'NavbarUp' of https://github.com/Frontend-Bootcamp-2022/…
aslannburrcu Jul 15, 2022
87e181c
Editing of file names
aslannburrcu Jul 15, 2022
4b88d6c
Edited SideBar
Onur-Morkoc Jul 15, 2022
80440fc
file names edited
Onur-Morkoc Jul 15, 2022
0b1f0e0
Merge branch 'main' of https://github.com/Frontend-Bootcamp-2022/reac…
Onur-Morkoc Jul 15, 2022
bd7741f
Edited
Onur-Morkoc Jul 15, 2022
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
Empty file removed .github/.keep
Empty file.
25,796 changes: 25,796 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "react-dashboard",
"name": "groupe-navbarup",
"version": "0.1.0",
"private": true,
"dependencies": {
Expand All @@ -8,6 +8,8 @@
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.4.0",
"react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
50 changes: 39 additions & 11 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

<title>React Dashboard</title>
</head>
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

<body>
<div id="root"></div>
</body>

</html>
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Binary file added public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions public/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
19 changes: 19 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

*{
text-decoration: none;
margin: 0;
padding: 0;
font-family: 'Montserrat', sans-serif;
}
body{
height: 100%;
width: 100%;
}
.container{
display: flex;
}
main{
height: 1000px;
width: 100%;
}

16 changes: 13 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@

import Sidebar from "./components/Sidebar/Sidebar";
import "./App.css"
import Navbar from "./components/Navbar/Navbar";
const App = () => {
return (
<h1>React Dashboard</h1>
);
<div className="container">
<nav>
<Sidebar />
</nav>
<main>
<Navbar />
</main>
</div>
)
}

export default App;
3 changes: 3 additions & 0 deletions src/Images/messageIcon.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/Images/notification.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Images/profileImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Images/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Images/settingsIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions src/components/Button.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

:root {
--primary: #3acbf7;

}

.btn {
padding: 8px 20px;
border-radius: 4px;
outline: none;
cursor: pointer;
}

.btn:hover{
padding: 8px 20px;
transition: all 0.3s ease-out;
background: #fff;
color: #6568f4;
transition: 250ms;
}

.btn--primary{
background-color: var(--primary);
}

.btn--outline{
background-color: transparent;
color: #fff;
padding: 8px 20px;
border-radius: 4px;
border: 1px solid var(--primary);
transition: all 0.3s ease-out;
}

.btn--medium{
padding: 8px 20px;
border-radius: 4px;
font-size: 18px;
color: #fff;
}

.btn--large{
padding: 12px 26px;
border-radius: 4px;
font-size: 20px;
color: #fff;
}
33 changes: 33 additions & 0 deletions src/components/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

import React from "react";
import './Button.css'

const STYLES = [
'btn--primary',
'btn--outline'
]

const SİZES = [
'btn--medium',
'btn--large'
]

export const Button = ({
children,
type,
onClick,
buttonStyle,
ButtonSize,
}) => {

const checkButtonStyle = STYLES.includes(buttonStyle) ? buttonStyle : STYLES[0]

const checkButtonSize = SİZES.includes(ButtonSize) ? ButtonSize : SİZES[0]

return (
<button className={"btn ${checkButtonStyle} ${checkButtonSize}"} onClick={onClick}
type={type}>
{children}
</button>
)
}
29 changes: 29 additions & 0 deletions src/components/Navbar/MenuItems.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

import messageIcon from "../../Images/messageIcon.svg"
import notification from "../../Images/notification.svg"
import settingsIcon from "../../Images/settingsIcon.svg"


export const MenuItems = [
{

title: 'Home',
url: '#',
cName: 'nav-links',
iconPath: messageIcon
},
{
title: 'Services',
url: '#',
cName: 'nav-links',
iconPath: notification

},
{
title: 'Products',
url: '#',
cName: 'nav-links',
iconPath: settingsIcon

}
]
Loading