diff --git a/src/app.py b/src/app.py
index 42b2580..e02b874 100644
--- a/src/app.py
+++ b/src/app.py
@@ -4,28 +4,9 @@ import json
proj = json.load(open("./static/json/projects.json", "r"))
timeline = json.load(open("./static/json/timeline.json", "r"))
-pages = {
- "home": {
- "template": "home.html",
- "title": "Andrew Simonson - Portfolio Home",
- "description": "Andrew Simonson's Digital Portfolio home",
- "canonical": "/",
- },
- "projects": {
- "template": "projects.html",
- "projects": proj,
- "title": "Andrew Simonson - Projects",
- "description": "Recent projects by Andrew Simonson on his lovely portfolio website :)",
- "canonical": "/projects",
- },
- "about": {
- "template": "about.html",
- "timeline": timeline,
- "title": "Andrew Simonson - About Me",
- "description": "About Andrew Simonson",
- "canonical": "/about",
- },
-}
+pages = json.load(open("./static/json/pages.json", "r"))
+pages['about']['timeline'] = timeline
+pages['projects']['projects'] = proj
app = flask.Flask(__name__)
diff --git a/src/static/css/App.css b/src/static/css/App.css
index 7ec7d1f..4eda8ed 100644
--- a/src/static/css/App.css
+++ b/src/static/css/App.css
@@ -339,15 +339,6 @@ a {
margin-right: auto;
}
-.carousel-container {
- margin-left: 10%;
- max-width: 80%;
-}
-
-.elementBlock {
- margin-top: 3rem;
-}
-
.skills {
display: inline-block;
background-color: rgba(0, 0, 0, 0.3);
@@ -365,103 +356,6 @@ a {
color: rgb(212, 212, 212);
}
-#skillList {
- color: white;
- display: flex;
- flex-wrap: wrap;
-}
-
-#skillDisp {
- width: 30em;
- position: relative;
-}
-
-#skillDisp::after {
- background-repeat: no-repeat;
- background-size: contain;
- background-position: right top;
- opacity: .2;
- position: absolute;
- height: 60%;
- width: 100%;
- top: 0;
- right: 0;
- content: "";
- z-index: -1;
-}
-
-#skillDisp.python::after {
- background-image: url('https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Python-logo-notext.svg/1200px-Python-logo-notext.svg.png')
-}
-
-#skillDisp.js::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=http%3A%2F%2F3.bp.blogspot.com%2F-PTty3CfTGnA%2FTpZOEjTQ_WI%2FAAAAAAAAAeo%2FKeKt_D5X2xo%2Fs1600%2Fjs.jpg&f=1&nofb=1&ipt=c8ae673676226ae40a5cd1408a5c7607e6b9725025888f4994a705309a16d1c3&ipo=images')
-}
-
-#skillDisp.html::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Flogos-download.com%2Fwp-content%2Fuploads%2F2017%2F07%2FHTML5_badge.png&f=1&nofb=1&ipt=db644f64f96f334aad37d31dc1c9dab28021476f6effaa0cb682297f8fd14240&ipo=images')
-}
-
-#skillDisp.sql::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fcdn3.iconfinder.com%2Fdata%2Ficons%2Fbasicolor-computer-tech%2F24%2F091_database_data_sql-512.png&f=1&nofb=1&ipt=cffc17203486b92c9733b992733e6934c03f984bc530c94b75bed278bc73477d&ipo=images')
-}
-
-#skillDisp.cpp::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fen.nokiawroclaw.pl%2Fwp-content%2Fuploads%2Fsites%2F5%2F2018%2F11%2Fcpp_logo.png&f=1&nofb=1&ipt=5fc23951b00bcbdec1977f3bc4591a7b8511ab29f5982963c541526902c0b4fd&ipo=images')
-}
-
-#skillDisp.other::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fcdn.freebiesupply.com%2Flogos%2Flarge%2F2x%2Fgit-icon-logo-png-transparent.png&f=1&nofb=1&ipt=834c5a11f63e26429713be2b7d9c9d1e45ce53d771862b9ab49bc35571513894&ipo=images')
-}
-
-#skillDisp.tools::after {
- background-image: url('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fimages.g2crowd.com%2Fuploads%2Fproduct%2Fimage%2Flarge_detail%2Flarge_detail_64636a5c446c22391d4ed719e0987cd2%2Farcgis-pro.png&f=1&nofb=1&ipt=812a2905dd03e5c68f55a9f095bfe7a54feb801bf7f3f11cc01352f45f8a4f8d&ipo=images')
-}
-
-.hex-wrapper {
- display: flex;
- flex-direction: column;
- margin-top: 50px;
-}
-
-.hex-row {
- display: flex;
-}
-
-.hex {
- width: 100px;
- height: 100px;
- position: relative;
- margin: 0px 5px;
-}
-
-.hex:hover {
- transform: scaleX(1.1) scaleY(1.1);
-}
-
-.hex>* {
- position: absolute;
-}
-
-.hex-odd {
- margin: 0px 55px;
-}
-
-.hex-border {
- border-left: solid black 3px;
- border-right: solid black 3px;
- width: 100%;
- height: 58%;
-}
-
-.hex>.hex-border:nth-child(1) {
- rotate: 60deg;
-}
-
-.hex>.hex-border:nth-child(2) {
- rotate: 120deg;
-}
-
.projectList {
padding: 0px;
display: flex;
@@ -618,22 +512,6 @@ a {
}
}
-@keyframes swipeIn {
- 100% {
- opacity: 1;
- transform: translateX(0);
- }
-
- 0% {
- opacity: 0;
- transform: translateX(100px);
- }
-}
-
-.swipeIn {
- animation: swipeIn 1s 1;
-}
-
.fPage {
height: 100vh;
width: 100%;
@@ -815,16 +693,6 @@ a {
font-family: robotoreg;
}
-/* .timeline-item::before{
- content: "";
- background-color: red;
- border: solid black 3px;
- border-radius: 100%;
- padding: 5px;
- position: absolute;
- margin-left: -8px;
-} */
-
.datetext {
margin: .25em;
font-size: small;
diff --git a/src/static/json/pages.json b/src/static/json/pages.json
new file mode 100644
index 0000000..cc087d8
--- /dev/null
+++ b/src/static/json/pages.json
@@ -0,0 +1,20 @@
+{
+ "home": {
+ "template": "home.html",
+ "title": "Andrew Simonson - Portfolio Home",
+ "description": "Andrew Simonson's Digital Portfolio home",
+ "canonical": "/"
+ },
+ "projects": {
+ "template": "projects.html",
+ "title": "Andrew Simonson - Projects",
+ "description": "Recent projects by Andrew Simonson on his lovely portfolio website :)",
+ "canonical": "/projects"
+ },
+ "about": {
+ "template": "about.html",
+ "title": "Andrew Simonson - About Me",
+ "description": "About Andrew Simonson",
+ "canonical": "/about"
+ }
+}
diff --git a/src/templates/header.html b/src/templates/header.html
index 401a309..4e61678 100644
--- a/src/templates/header.html
+++ b/src/templates/header.html
@@ -53,8 +53,8 @@
/>
-
-
+
+