aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/index.html4
-rw-r--r--src/components/App.js2
-rw-r--r--src/components/navigation/Footer.js2
-rw-r--r--src/components/navigation/NavigationBar.js29
-rw-r--r--src/components/projectData.js2
-rw-r--r--src/components/skills/SkillListing.js2
-rw-r--r--src/index.js7
-rw-r--r--src/pages/Home.js16
-rw-r--r--src/styles/main.css52
9 files changed, 72 insertions, 44 deletions
diff --git a/public/index.html b/public/index.html
index af6ea12..feb08cf 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,8 +15,8 @@
<script src="https://code.jquery.com/jquery-3.4.1.js"></script>
<!-- Bootstrap CDNs -->
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+ <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+ <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script> -->
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono:100,100i,300,300i,400,400i,500,500i,700,700i" rel="stylesheet">
diff --git a/src/components/App.js b/src/components/App.js
index 198311f..04ca377 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -31,7 +31,7 @@ export default class App extends Component {
<Routes />
- <Footer />
+ {/* <Footer /> */}
</div>
</div>
</React.Fragment>
diff --git a/src/components/navigation/Footer.js b/src/components/navigation/Footer.js
index ff260b1..495283a 100644
--- a/src/components/navigation/Footer.js
+++ b/src/components/navigation/Footer.js
@@ -44,7 +44,7 @@ export default class Footer extends Component {
<a id="media-item-2" href="https://youtube.com/Fuwny">yt</a>
</li>
<li id="gh" className="wow fadeInUp" data-wow-delay="1s">
- <a id="media-item-3" href="https://github.com/8cy">gh</a>
+ <a id="media-item-3" href="https://github.com/fuwn">gh</a>
</li>
</ul>
<br /><br />
diff --git a/src/components/navigation/NavigationBar.js b/src/components/navigation/NavigationBar.js
index a757b71..86a9a77 100644
--- a/src/components/navigation/NavigationBar.js
+++ b/src/components/navigation/NavigationBar.js
@@ -5,41 +5,14 @@ export default class NavigationBar extends Component {
return(
<React.Fragment>
<nav>
- { /* <div className="blur"></div> */ }
-
- <span id="brand">
- <a href="/">::</a>
- </span>
-
<ul id="menu">
<li><a id="menu-item-1" href="/">/home</a></li>
- <li>
- <a id="menu-item-2" href="/skills">/skills &nbsp;
- <img src="https://web.archive.org/web/20091027081341/http://geocities.com/serbianchog/new1.gif"
- alt="new" />
- </a>
- </li>
+ <li><a id="menu-item-2" href="/skills">/skills</a></li>
<li><a id="menu-item-3" href="/projects">/projects</a></li>
<li><a id="menu-item-4" href="/about">/about me</a></li>
{ /* <li><a href="/contact">contact<span>.</span></a></li> */ }
</ul>
-
- <div id="toggle">
- <div className="span">menu</div>
- </div>
</nav>
-
- <div id="resize">
- <div className="close-btn">close</div>
-
- <ul id="menu">
- <li><a href="/">home<span>.</span></a></li>
- <li><a href="/skills">skills<span>.</span></a></li>
- <li><a href="/projects">projects<span>.</span></a></li>
- <li><a href="/about">about me<span>.</span></a></li>
- { /* <li><a href="/contact">contact<span>.</span></a></li> */ }
- </ul>
- </div>
</React.Fragment>
)
}
diff --git a/src/components/projectData.js b/src/components/projectData.js
index c0fa074..f214cdb 100644
--- a/src/components/projectData.js
+++ b/src/components/projectData.js
@@ -25,7 +25,7 @@ let projectData = {
{
"title": "projects/ github.",
"image": "https://kinsta.com/wp-content/uploads/2018/04/what-is-github-1-1.png",
- "redirect": "https://github.com/8cy"
+ "redirect": "https://github.com/fuwn"
}
]
},
diff --git a/src/components/skills/SkillListing.js b/src/components/skills/SkillListing.js
index 9cf2b5e..ef1090d 100644
--- a/src/components/skills/SkillListing.js
+++ b/src/components/skills/SkillListing.js
@@ -134,7 +134,7 @@ export default class Skills extends Component {
<li>
<h6>Few Lua experience</h6>
<ul>
- <li>My <a href="https://github.com/8cy/lua-discord-bot-example">Discord bot</a> example, made using the <a href="https://github.com/SinisterRectus/Discordia">Discordia</a> Lua library.</li>
+ <li>My <a href="https://github.com/fuwn/lua-discord-bot-example">Discord bot</a> example, made using the <a href="https://github.com/SinisterRectus/Discordia">Discordia</a> Lua library.</li>
</ul>
</li>
</ul>
diff --git a/src/index.js b/src/index.js
index a047261..5b1226d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,11 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import './styles/style.css'
-import './styles/projects.css';
-import './styles/work-categories.css';
+// import './styles/style.css'
+// import './styles/projects.css';
+// import './styles/work-categories.css';
//import './styles/animate.css'
+import './styles/main.css'
import App from './components/App';
import * as serviceWorker from './serviceWorker';
diff --git a/src/pages/Home.js b/src/pages/Home.js
index 6a6f2ce..67a9a96 100644
--- a/src/pages/Home.js
+++ b/src/pages/Home.js
@@ -1,10 +1,5 @@
import React, { Component } from 'react';
-import Hero from '../components/home/Hero';
-// import FeaturedProjects from '../components/home/FeaturedProjects';
-
-// import projectData from '../components/projectData';
-
import DynamicTitle from '../components/navigation/DynamicTitle';
export default class Home extends Component {
@@ -12,8 +7,15 @@ export default class Home extends Component {
return(
<React.Fragment>
<DynamicTitle title="Home | Fuwn" />
- <Hero />
- { /* <FeaturedProjects projectData={projectData} /> */ }
+
+ <pre>
+ # Fuwn
+
+ ## Quick Links
+ - <a href="">Skills</a>
+ - <a href="">About Me</a>
+ - <a href="">GitHub</a>
+ </pre>
</React.Fragment>
)
}
diff --git a/src/styles/main.css b/src/styles/main.css
new file mode 100644
index 0000000..06aadaa
--- /dev/null
+++ b/src/styles/main.css
@@ -0,0 +1,52 @@
+* {
+ background-color: #1c1c1c;
+}
+
+.wrapper {
+ max-width: 500px;
+ margin: auto;
+}
+
+p {
+ color: #dfd7af;
+}
+
+nav {
+ width: 100%;
+ height: 80px;
+ /* position: fixed; */
+ margin: 0 auto;
+ z-index: 1;
+}
+
+nav #menu {
+ float: left;
+ right: 80px;
+ position: fixed;
+}
+
+nav #menu li {
+ padding-left: 30px; /* 40px */
+ display: inline-block;
+ cursor: pointer;
+ font-weight: 300;
+ line-height: 80px;
+ position: relative;
+ transition: all 0.3s ease-out;
+}
+
+nav #menu li span {
+ font-weight: 700;
+}
+
+nav #menu li a {
+ color: #dfd7af;
+ transition: 0.5s;
+}
+
+nav #menu li a:hover {
+ text-decoration: none;
+ color: #1c1c1c;
+ background-color: #dfd7af;
+ transition: 0.5s;
+} \ No newline at end of file