aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex@scerba.org>2024-03-13 17:09:48 -0400
committerAlex Scerba <alex@scerba.org>2024-10-29 13:20:01 -0400
commitf97d476b495126fd2474b8e3a2968658395d2a0f (patch)
tree866ce2531ea9ada192e01faeecd42fc02bc5b0c1
parent99d92792daedc0501886edc7c4e4a9f3768f9b8a (diff)
Complete restructure
-rw-r--r--cmd/http/errors.go (renamed from errors.go)0
-rw-r--r--cmd/http/handle.go (renamed from handle.go)4
-rw-r--r--cmd/http/load.go (renamed from load.go)61
-rw-r--r--cmd/http/main.go (renamed from main.go)0
-rw-r--r--cmd/http/middle.go (renamed from middle.go)0
-rw-r--r--cmd/http/render.go (renamed from render.go)36
-rw-r--r--html/index.tmpl.html (renamed from html/main/index.tmpl.html)0
-rw-r--r--html/main/about.tmpl.html23
-rw-r--r--html/main/blog.tmpl.html17
-rw-r--r--html/main/projects.tmpl.html22
-rw-r--r--html/master.tmpl.html12
-rw-r--r--md/POST_TEMPLATE.tmpl.html15
-rw-r--r--md/deployed/Chevrolet_Vision_SS/Chevrolet_Vision_SS.md20
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_1.jpgbin146903 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_2.jpgbin203950 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_3.jpgbin402057 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_4.jpgbin357898 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_5.jpgbin320262 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_6.jpgbin290014 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_1.jpgbin1429876 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_2.jpgbin747339 -> 0 bytes
-rw-r--r--md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_3.jpgbin866076 -> 0 bytes
-rwxr-xr-xmd/postDeploy.sh74
-rw-r--r--md/postDeployWSL.sh74
-rw-r--r--md/staged/NewPost.md15
-rw-r--r--md/template.md15
-rw-r--r--static/Resume_Scerba.pdf (renamed from static/documents/Resume_Scerba_Fall2023.pdf)bin41311 -> 41311 bytes
-rw-r--r--static/assets/favicon.ico (renamed from static/favicon.ico)bin244798 -> 244798 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt (renamed from static/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html (renamed from static/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff)bin25040 -> 25040 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff)bin25660 -> 25660 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff)bin24104 -> 24104 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png)bin81338 -> 81338 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff)bin25444 -> 25444 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff)bin25356 -> 25356 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png)bin84723 -> 84723 bytes
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css)0
-rw-r--r--static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css (renamed from static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css)0
-rw-r--r--static/assets/grid.png (renamed from static/grid.png)bin197 -> 197 bytes
-rw-r--r--static/assets/logo.svg (renamed from static/logo.svg)0
-rw-r--r--static/assets/script.js (renamed from static/script.js)0
-rw-r--r--static/assets/sitemap.xml (renamed from static/sitemap.xml)0
-rw-r--r--static/assets/style.css (renamed from static/style.css)56
62 files changed, 67 insertions, 377 deletions
diff --git a/errors.go b/cmd/http/errors.go
index 9406a9a..9406a9a 100644
--- a/errors.go
+++ b/cmd/http/errors.go
diff --git a/handle.go b/cmd/http/handle.go
index 7414665..10aed2c 100644
--- a/handle.go
+++ b/cmd/http/handle.go
@@ -13,13 +13,13 @@ func (app *application) home(w http.ResponseWriter, r *http.Request) {
app.notFound(w)
return
} else {
- p, err := app.loadPosts("html/projects", -1)
+ p, err := app.aggregate("html/projects")
if err != nil {
app.serverError(w, err)
return
}
- err = renderTemplate(w, "main/index", p)
+ err = renderTemplate(w, "index", p)
if err != nil {
app.serverError(w, err)
return
diff --git a/load.go b/cmd/http/load.go
index 89496f4..a94cbeb 100644
--- a/load.go
+++ b/cmd/http/load.go
@@ -19,25 +19,8 @@ type Posts struct {
Contents []*Post
}
-func (p Post) containsTag(filterTag string) bool {
- if filterTag == "" {
- return true
- }
-
- for _, tag := range p.Tags {
- if filterTag == tag {
- return true
- }
- }
-
- return false
-}
-
-func (app *application) loadPosts(location string, postCount int) (p *Posts, err error) {
- if postCount == 0 || postCount < -1 {
- return nil, os.ErrInvalid
- }
-
+// Read all found files and load them into a stuct
+func (app *application) aggregate(location string) (p *Posts, err error) {
var posts []*Post
files, err := os.ReadDir(location)
@@ -45,17 +28,13 @@ func (app *application) loadPosts(location string, postCount int) (p *Posts, err
return nil, err
}
+ // Loop over every file in the directory and read the contents.
for _, file := range files {
if !file.IsDir() && strings.HasSuffix(file.Name(), ".tmpl.html") {
newPost, err := app.readFile(location + "/" + file.Name())
if err != nil {
return nil, err
}
- /*
- // filtering by tag
- if !newPost.containsTag(filterTag) {
- continue
- } */
posts = append(posts, newPost)
}
@@ -65,13 +44,7 @@ func (app *application) loadPosts(location string, postCount int) (p *Posts, err
return posts[i].Date > posts[j].Date
})
- if postCount == -1 {
- return &Posts{Contents: posts}, nil
- } else if postCount < len(posts) {
- return &Posts{Contents: posts[:postCount]}, nil
- } else {
- return &Posts{Contents: posts}, nil
- }
+ return &Posts{Contents: posts}, nil
}
func (app *application) readFile(location string) (p *Post, err error) {
@@ -80,7 +53,7 @@ func (app *application) readFile(location string) (p *Post, err error) {
return nil, err
}
- var tmp *Post = new(Post)
+ var post *Post = new(Post)
fileName := strings.TrimSuffix(strings.Split(location, "/")[2], ".tmpl.html")
@@ -100,32 +73,32 @@ func (app *application) readFile(location string) (p *Post, err error) {
// tags
tagsPattern := regexp.MustCompile(`{{define "keywords"}}([\w\s]+){{end}}`)
- tagsMatching := tagsPattern.FindStringSubmatch(string(fileContent))
+ matchingTags := tagsPattern.FindStringSubmatch(string(fileContent))
var tags []string
- if len(tagsMatching) > 1 {
- tags = strings.Fields(tagsMatching[1])
+ if len(matchingTags) > 1 {
+ tags = strings.Fields(matchingTags[1])
} else {
tags = []string{}
}
// thumbnail image
imagePattern := regexp.MustCompile(`<img src="(.+)" class="mainImage"( alt="(.+)")* />`)
- imageMatching := imagePattern.FindStringSubmatch(string(fileContent))
+ matchingImage := imagePattern.FindStringSubmatch(string(fileContent))
var image string
- if len(imageMatching) > 1 {
- image = imageMatching[0]
+ if len(matchingImage) > 1 {
+ image = matchingImage[0]
} else {
image = ""
}
- tmp.FileName = fileName
- tmp.Title = title
- tmp.Date = date
- tmp.Tags = tags
- tmp.Image = image
+ post.FileName = fileName
+ post.Title = title
+ post.Date = date
+ post.Tags = tags
+ post.Image = image
- return tmp, nil
+ return post, nil
}
diff --git a/main.go b/cmd/http/main.go
index 8bfb33d..8bfb33d 100644
--- a/main.go
+++ b/cmd/http/main.go
diff --git a/middle.go b/cmd/http/middle.go
index 29b49a6..29b49a6 100644
--- a/middle.go
+++ b/cmd/http/middle.go
diff --git a/render.go b/cmd/http/render.go
index 83416f5..2ce954d 100644
--- a/render.go
+++ b/cmd/http/render.go
@@ -12,33 +12,25 @@ func renderTemplate(w http.ResponseWriter, tmplPath string, p *Posts) (err error
return err
}
- data := combineData(tmplPath, p)
-
- err = t.Execute(w, data)
- if err != nil {
- return err
- }
-
- return nil
-}
-
-func combineData(path string, p *Posts) map[string]interface{} {
- splitPath := strings.Split(path, "/")
+ splitPath := strings.Split(tmplPath, "/")
data := make(map[string]interface{})
- if splitPath[0] == "main" {
- switch splitPath[1] {
- case "about":
- data["Page"] = splitPath[1]
- default:
- data["Page"] = splitPath[1]
- data["Posts"] = p
- }
+ // If were loading the index, set page to 'Index' and pass through all posts.
+ // Otherwise, set page to 'Projects' and pass through the first post (should only be one
+ // coming in)
+ if splitPath[0] == "index" {
+ data["Page"] = "Index"
+ data["Posts"] = p
} else {
- data["Page"] = splitPath[0]
+ data["Page"] = "Project"
data["Post"] = p.Contents[0]
}
- return data
+ err = t.Execute(w, data)
+ if err != nil {
+ return err
+ }
+
+ return nil
}
diff --git a/html/main/index.tmpl.html b/html/index.tmpl.html
index 3bb171a..3bb171a 100644
--- a/html/main/index.tmpl.html
+++ b/html/index.tmpl.html
diff --git a/html/main/about.tmpl.html b/html/main/about.tmpl.html
deleted file mode 100644
index 1ea7e99..0000000
--- a/html/main/about.tmpl.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ define "title" }}About{{end}}
-{{ define "description" }}About me and my site.{{end}}
-{{ define "keywords" }}about{{end}}
-{{ define "canonical" }}/about{{end}}
-
-{{ define "main" }}
- <div class="uneven-column-grid">
- <h1>About</h1>
- <img src="/static/media/alex_profile_512.jpg" alt="Highschool senior photo portrait of Alex next to Yerkes Observatory." style="margin-bottom: 3rem"/>
- <div class="postBackground">
- <div class="postContent">
- <p>My name is Alex Scerba, a Junior in the College for Creative Studies: Transportation Design program in Detroit, MI.</p>
- <p>Growing up in Lake Geneva, WI, I developed a passion for making and tinkering, which lead me down the path of industrial design. I love working with my hands, fixing up and riding motorcycles and cars, and learning new skills.</p>
- <p>In addition to sketching, rendering, and modeling, my hobby skills include programming (<a href="https://github.com/ascerba/personal-website" target="_blank" rel="noopener noreferrer">this website</a>), bookbinding, and woodworking.</p>
- <blockquote>"It's just a machine. Open it up and see what's wrong."</blockquote>
- <p>This summer, I hope to secure an internship to learn more skills in the design and manufacturing industry.</p>
- <p>Connect with me on LinkedIn: <a href="https://linkedin.com/in/ascerba" target="_blank" rel="noopener noreferrer">linkedin.com/in/ascerba</a></p>
- <p>Contact me at <a href="mailto:me@alexscerba.com">me@alexscerba.com</a></p>
- <p>View my <a href="/static/documents/Resume_Scerba_Fall2023.pdf">résumé</a>
- </div>
- </div>
- </div>
-{{ end }} \ No newline at end of file
diff --git a/html/main/blog.tmpl.html b/html/main/blog.tmpl.html
deleted file mode 100644
index 989743c..0000000
--- a/html/main/blog.tmpl.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ define "title" }}Blog{{end}}
-{{ define "description" }}Site blog featuring personal and project updates as well as anything random I want to share.{{end}}
-{{ define "keywords" }}blog{{end}}
-{{ define "canonical" }}/blog{{end}}
-
-{{ define "main" }}
- <h1>Blog</h1>
-
- <section class="postBackground">
- <div class="postContent">
- <h2>Entries</h2>
-{{ range .Posts.Contents}}
- <p>- <a href="/blog/{{ .FileName }}">{{ .Title }}</a></p>
-{{ end }}
- </div>
- </section>
-{{ end }} \ No newline at end of file
diff --git a/html/main/projects.tmpl.html b/html/main/projects.tmpl.html
deleted file mode 100644
index 18ad060..0000000
--- a/html/main/projects.tmpl.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ define "title" }}Projects{{end}}
-{{ define "description" }}Porfolio projects.{{end}}
-{{ define "keywords" }}projects{{end}}
-{{ define "canonical" }}/projects{{end}}
-
-{{ define "main" }}
- <h1>Projects</h1>
-
- <section class="postBackground">
- <div class="projectList">
- <h2>Completed</h2>
-{{ range .Posts.Contents }}
- <figure class="thumbnail">
- <a href="/projects/{{ .FileName }}">
- {{ .Image }}
- <figcaption>{{ .Title }}</figcaption>
- </a>
- </figure>
-{{ end }}
- </div>
- </section>
-{{ end }} \ No newline at end of file
diff --git a/html/master.tmpl.html b/html/master.tmpl.html
index 8cd9e87..5843607 100644
--- a/html/master.tmpl.html
+++ b/html/master.tmpl.html
@@ -9,13 +9,13 @@
<meta name="description" content="{{block "description" .}}Alex's personal site{{end}}" />
<meta name="keywords" content="{{block "keywords" .}}personal site{{end}}">
<link rel="canonical" href="https://www.alexscerba.com{{block "canonical" .}}{{end}}">
- <link rel="stylesheet" href="/static/style.css" />
- <link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon" />
+ <link rel="stylesheet" href="/static/assets/style.css" />
+ <link rel="shortcut icon" href="/static/assets/favicon.ico" type="image/x-icon" />
</head>
<body>
<header>
<a href="/" class="logo-w-name">
- <img src="/static/logo.svg" alt="Logo" class="logo"/>
+ <img src="/static/assets/logo.svg" alt="Logo" class="logo"/>
<span class="name">Alex Scerba</span>
</a>
<div class="main-nav-position">
@@ -23,7 +23,7 @@
<div class="hamburger"><div></div></div>
<nav aria-labelledby="global-navigation" class="main-nav">
<a href="/">Home</a>
- <a href="/static/documents/Resume_Scerba_Fall2023.pdf">Résumé</a> <!--Résumé-->
+ <a href="/static/Resume_Scerba.pdf">Résumé</a> <!--Résumé-->
</nav>
</div>
</header>
@@ -35,11 +35,11 @@
</main>
<footer>
- <img src="/static/logo.svg" alt="Logo" class="footer-logo"/>
+ <img src="/static/assets/logo.svg" alt="Logo" class="footer-logo"/>
<address>
<p>Contact: <a href="mailto:me@alexscerba.com">me@alexscerba.com</a></p>
<p>LinkedIn: <a href="https://linkedin.com/in/ascerba" target="_blank" rel="noopener noreferrer">linkedin.com/in/ascerba</a></p></p>
- <p>Résumé: <a href="/static/documents/Resume_Scerba_Fall2023.pdf">view</a></p>
+ <p>Résumé: <a href="/static/Resume_Scerba.pdf">view</a></p>
</address>
</footer>
</body>
diff --git a/md/POST_TEMPLATE.tmpl.html b/md/POST_TEMPLATE.tmpl.html
deleted file mode 100644
index cca9a30..0000000
--- a/md/POST_TEMPLATE.tmpl.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{define "title"}}{{.Post.Title}}{{end}}
-{{define "description"}}$description${{end}}
-{{define "keywords"}}$tags${{end}}
-{{ define "canonical" }}$canonical${{end}}
-
-{{define "main"}}
-<h1>$page$</h1>
-<div class="postBackground">
- <article class="$type$Content">
- <h2>{{.Post.Title}}</h2>
- $body$
- <p>Uploaded: <time datetime="$date$">$date$</time></p>
- </article>
-</div>
-{{end}}
diff --git a/md/deployed/Chevrolet_Vision_SS/Chevrolet_Vision_SS.md b/md/deployed/Chevrolet_Vision_SS/Chevrolet_Vision_SS.md
deleted file mode 100644
index 57921b5..0000000
--- a/md/deployed/Chevrolet_Vision_SS/Chevrolet_Vision_SS.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-page: Project
-title: 2035 Chevrolet Vision SS
-date: 2023-11-02
-description: Chevrolet design project set in 2035. Purpose-built EV sports car.
-tags: project exterior Chevrolet CCS sports-car
-cononical: /projects
-type: post
----
-
-The 2035 Chevrolet Vision SS project is aimed at designing a purpose-built sports car for the EV future.
-
-![](VisionSS_1.jpg)
-![](VisionSS_2.jpg)
-![](VisionSS_3.jpg)
-![](VisionSS_4.jpg)
-![](VisionSS_Render_1.jpg)
-![](VisionSS_Render_2.jpg){class="mainImage"}
-![](VisionSS_Render_3.jpg)
-![](VisionSS_6.jpg) \ No newline at end of file
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_1.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_1.jpg
deleted file mode 100644
index 0846ade..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_1.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_2.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_2.jpg
deleted file mode 100644
index 48a3aa8..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_2.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_3.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_3.jpg
deleted file mode 100644
index a6d7c1b..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_3.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_4.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_4.jpg
deleted file mode 100644
index ea1afd3..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_4.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_5.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_5.jpg
deleted file mode 100644
index 8ae501e..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_5.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_6.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_6.jpg
deleted file mode 100644
index ce570b2..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_6.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_1.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_1.jpg
deleted file mode 100644
index 0b41954..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_1.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_2.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_2.jpg
deleted file mode 100644
index a7f1cda..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_2.jpg
+++ /dev/null
Binary files differ
diff --git a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_3.jpg b/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_3.jpg
deleted file mode 100644
index 02e64b3..0000000
--- a/md/deployed/Chevrolet_Vision_SS/images/VisionSS_Render_3.jpg
+++ /dev/null
Binary files differ
diff --git a/md/postDeploy.sh b/md/postDeploy.sh
deleted file mode 100755
index b8a8570..0000000
--- a/md/postDeploy.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# converts md to .tmpl.html with pandoc
-# Usage: ./postDeploy.sh title_of_post.md type
-# type can be 'blog' or 'projects' in my case
-
-if [ -z $3 ]
-then
- base_dir="/home/ascerba/go/alexscerba.com"
-else
- base_dir="$3"
-fi
-
-readonly posts_dir="$base_dir/html/$2"
-readonly post_temp="$base_dir/md/POST_TEMPLATE.tmpl.html"
-
-post=$(basename "$1" .md)
-echo "converting $1 to HTML"
-echo "Outputting at '$posts_dir/$post.tmpl.html'"
-
-# pandoc for md to html
-pandoc -f markdown-auto_identifiers -t html --template=$post_temp --wrap=none -o "$posts_dir/$post.tmpl.html" "$1"
-
-# # adds in filename to path no longer needed
-sed -i "s;src=\";src=\"/static/media/$post/;" "$posts_dir/$post.tmpl.html"
-
-# Pull images from <p> tags
-sed -i "s;<p><img;<img;" "$posts_dir/$post.tmpl.html"
-sed -i "s;/></p>;/>;" "$posts_dir/$post.tmpl.html"
-
-# Same but for video
-sed -i "s;<p><video;<video;" "$posts_dir/$post.tmpl.html"
-sed -i "s;</video></p>;</video>;" "$posts_dir/$post.tmpl.html"
-
-# makes http & https links have target _blank and rel noopener noreferrer
-perl -i -0pe 's/(<\W*a\W*[^>]*href=)(["'"'"']http[s]?:\/\/[^"'"'"'>]*["'"'"'])([^>]*>)/$1$2 target="_blank" rel="noopener noreferrer"$3/g' "$posts_dir/$post.tmpl.html"
-
-media_dir="$base_dir/static/media/$post"
-
-if [ -d "$base_dir/md/staged/images" ]
-then
- echo "Converting and deploying images:"
- if [ ! -d "$base_dir/static/media/$post" ]
- then
- mkdir "$base_dir/static/media/$post"
- fi
- for image in $(ls "$base_dir/md/staged/images")
- do
- echo "Converting $image and deploying at $media_dir/$image"
- convert $base_dir/md/staged/images/$image -resize 1000x1000\> "$media_dir/$image"
- /home/ascerba/.local/bin/cwebp -q 70 "$media_dir/$image" "$media_dir/${image%.*}.webp"
- done
-fi
-
-if [ -d "$base_dir/md/staged/videos" ]
-then
- echo "Deploying videos:"
- if [ ! -d "$base_dir/static/media/$post" ]
- then
- mkdir "$base_dir/static/media/$post"
- fi
- for video in $(ls "$base_dir/md/staged/videos")
- do
- echo "Copying $video to $media_dir/$video"
- cp $base_dir/md/staged/videos/$video $media_dir/$video
- done
-fi
-
-#echo "Contents of 'staged' will not be moved or deleted"
-echo "Moving staged contents to 'deployed' folder"
-mv -vT "$base_dir/md/staged" "$base_dir/md/deployed/$post"
-mkdir "$base_dir/md/staged"
-cp "$base_dir/md/template.md" "$base_dir/md/staged/NewPost.md"
-echo "Post deploy complete!"
-echo "Dont forget to edit $post_dir/$post.tmpl.html if any videos were added...!" \ No newline at end of file
diff --git a/md/postDeployWSL.sh b/md/postDeployWSL.sh
deleted file mode 100644
index 0aed051..0000000
--- a/md/postDeployWSL.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# converts md to .tmpl.html with pandoc
-# Usage: ./postDeploy.sh title_of_post.md type
-# type can be 'blog' or 'projects' in my case
-
-if [ -z $3 ]
-then
- base_dir="/home/ascerba/go/alexscerba.com"
-else
- base_dir="$3"
-fi
-
-readonly posts_dir="$base_dir/html/$2"
-readonly post_temp="$base_dir/md/POST_TEMPLATE.tmpl.html"
-
-post=$(basename "$1" .md)
-echo "converting $1 to HTML"
-echo "Outputting at '$posts_dir/$post.tmpl.html'"
-
-# pandoc for md to html
-pandoc -f markdown-auto_identifiers -t html --template=$post_temp --wrap=none -o "$posts_dir/$post.tmpl.html" "$1"
-
-# # adds in filename to path no longer needed
-sed -i "s;src=\";src=\"/static/media/$post/;" "$posts_dir/$post.tmpl.html"
-
-# Pull images from <p> tags
-sed -i "s;<p><img;<img;" "$posts_dir/$post.tmpl.html"
-sed -i "s;/></p>;/>;" "$posts_dir/$post.tmpl.html"
-
-# Same but for video
-sed -i "s;<p><video;<video;" "$posts_dir/$post.tmpl.html"
-sed -i "s;</video></p>;</video>;" "$posts_dir/$post.tmpl.html"
-
-# makes http & https links have target _blank and rel noopener noreferrer
-perl -i -0pe 's/(<\W*a\W*[^>]*href=)(["'"'"']http[s]?:\/\/[^"'"'"'>]*["'"'"'])([^>]*>)/$1$2 target="_blank" rel="noopener noreferrer"$3/g' "$posts_dir/$post.tmpl.html"
-
-media_dir="$base_dir/static/media/$post"
-
-if [ -d "$base_dir/md/staged/images" ]
-then
- echo "Converting and deploying images:"
- if [ ! -d "$base_dir/static/media/$post" ]
- then
- mkdir "$base_dir/static/media/$post"
- fi
- for image in $(ls "$base_dir/md/staged/images")
- do
- echo "Converting $image and deploying at $media_dir/$image"
- convert $base_dir/md/staged/images/$image -resize 1800x1800\> "$media_dir/$image"
- #/home/ascerba/.local/bin/cwebp -q 70 "$media_dir/$image" "$media_dir/${image%.*}.webp" <------- ignore for now
- done
-fi
-
-if [ -d "$base_dir/md/staged/videos" ]
-then
- echo "Deploying videos:"
- if [ ! -d "$base_dir/static/media/$post" ]
- then
- mkdir "$base_dir/static/media/$post"
- fi
- for video in $(ls "$base_dir/md/staged/videos")
- do
- echo "Copying $video to $media_dir/$video"
- cp $base_dir/md/staged/videos/$video $media_dir/$video
- done
-fi
-
-#echo "Contents of 'staged' will not be moved or deleted"
-echo "Moving staged contents to 'deployed' folder"
-mv -vT "$base_dir/md/staged" "$base_dir/md/deployed/$post"
-mkdir "$base_dir/md/staged"
-cp "$base_dir/md/template.md" "$base_dir/md/staged/NewPost.md"
-echo "Post deploy complete!"
-echo "Dont forget to edit $post_dir/$post.tmpl.html if any videos were added...!" \ No newline at end of file
diff --git a/md/staged/NewPost.md b/md/staged/NewPost.md
deleted file mode 100644
index fa3223b..0000000
--- a/md/staged/NewPost.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-page: Project
-title: Title
-date: 2021-04-27
-description: Description
-tags: tmp
-cononical: /projects
-type: post
----
-
-text
-
-<div class="imgGrid">
-![caption](/file/path/image.jpg "title"){alt="atext" id="thumbnail"}
-</div> \ No newline at end of file
diff --git a/md/template.md b/md/template.md
deleted file mode 100644
index fa3223b..0000000
--- a/md/template.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-page: Project
-title: Title
-date: 2021-04-27
-description: Description
-tags: tmp
-cononical: /projects
-type: post
----
-
-text
-
-<div class="imgGrid">
-![caption](/file/path/image.jpg "title"){alt="atext" id="thumbnail"}
-</div> \ No newline at end of file
diff --git a/static/documents/Resume_Scerba_Fall2023.pdf b/static/Resume_Scerba.pdf
index e8d719e..e8d719e 100644
--- a/static/documents/Resume_Scerba_Fall2023.pdf
+++ b/static/Resume_Scerba.pdf
Binary files differ
diff --git a/static/favicon.ico b/static/assets/favicon.ico
index aeb36dd..aeb36dd 100644
--- a/static/favicon.ico
+++ b/static/assets/favicon.ico
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt b/static/assets/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt
index 6939980..6939980 100644
--- a/static/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/DejaVu Fonts License.txt
diff --git a/static/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html b/static/assets/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html
index 653499c..653499c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/How_to_use_webfonts.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html
index a445ce4..a445ce4 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-demo.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff
index 855858d..855858d 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css
index 3d6aef7..3d6aef7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css
index aecc43c..aecc43c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/specimen_files/specimen_stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css
index dc94d53..dc94d53 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html
index 516ee42..516ee42 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-demo.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff
index 7fdde38..7fdde38 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css
index 3d6aef7..3d6aef7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css
index aecc43c..aecc43c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/specimen_files/specimen_stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css
index 3dcbfa9..3dcbfa9 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html
index b0407fb..b0407fb 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-demo.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff
index 45914b8..45914b8 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png
index 0f7234c..0f7234c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/DejaVuSans-ExtraLight-cleartype.png
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css
index 3d6aef7..3d6aef7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css
index aecc43c..aecc43c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/specimen_files/specimen_stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css
index fb2f078..fb2f078 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html
index 06786a5..06786a5 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-demo.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff
index 64eebe7..64eebe7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css
index 3d6aef7..3d6aef7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css
index aecc43c..aecc43c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/specimen_files/specimen_stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css
index 596e9b7..596e9b7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html
index 325b2b7..325b2b7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-demo.html
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff
index 7c69ca9..7c69ca9 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png
index f6c2f1d..f6c2f1d 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/DejaVuSans-cleartype.png
Binary files differ
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css
index 3d6aef7..3d6aef7 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/grid_12-825-55-15.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css
index aecc43c..aecc43c 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/specimen_files/specimen_stylesheet.css
diff --git a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css
index 3c47fe3..3c47fe3 100644
--- a/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css
+++ b/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/stylesheet.css
diff --git a/static/grid.png b/static/assets/grid.png
index 77dbb95..77dbb95 100644
--- a/static/grid.png
+++ b/static/assets/grid.png
Binary files differ
diff --git a/static/logo.svg b/static/assets/logo.svg
index c513188..c513188 100644
--- a/static/logo.svg
+++ b/static/assets/logo.svg
diff --git a/static/script.js b/static/assets/script.js
index a7323f3..a7323f3 100644
--- a/static/script.js
+++ b/static/assets/script.js
diff --git a/static/sitemap.xml b/static/assets/sitemap.xml
index 44dd555..44dd555 100644
--- a/static/sitemap.xml
+++ b/static/assets/sitemap.xml
diff --git a/static/style.css b/static/assets/style.css
index 4db06f7..5386d83 100644
--- a/static/style.css
+++ b/static/assets/style.css
@@ -1,34 +1,34 @@
@font-face {
font-family: 'DejaVu Sans';
- src: url('/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff') format('woff');
+ src: url('/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_regular_macroman/DejaVuSans-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'DejaVu Sans';
- src: url('/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff') format('woff');
+ src: url('/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_bold_macroman/DejaVuSans-Bold-webfont.woff') format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'DejaVu Sans';
- src: url('/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff') format('woff');
+ src: url('/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_oblique_macroman/DejaVuSans-Oblique-webfont.woff') format('woff');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'DejaVu Sans';
- src: url('/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff') format('woff');
+ src: url('/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_boldoblique_macroman/DejaVuSans-BoldOblique-webfont.woff') format('woff');
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: 'DejaVu Sans';
- src: url('/static/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff') format('woff');
+ src: url('/static/assets/fonts/dejavu-sans-fontfacekit/web fonts/dejavusans_extralight_macroman/DejaVuSans-ExtraLight-webfont.woff') format('woff');
font-weight: lighter;
font-style: normal;
}
@@ -302,7 +302,7 @@ blockquote {
opacity: 0;
margin: 0;
}
-
+
.hamburger{
z-index: 3;
position: fixed;
@@ -313,16 +313,16 @@ blockquote {
padding: 5px;
/*border-bottom-left-radius: 8px;
background-color: var(--dark-transparent);*/
-
+
/* FOR DISPLAYING EVERY ELEMENT IN THE CENTER : */
-
+
display: flex;
align-items: center;
justify-content: center;
}
-
+
/* CREATING THE MIDDLE LINE OF THE HAMBURGER : */
-
+
.hamburger > div{
position: relative;
top: 0;
@@ -332,10 +332,10 @@ blockquote {
width: 60%;
transition: all 0.4s ease;
}
-
- /* CREATING THE TOP AND BOTTOM LINES :
+
+ /* CREATING THE TOP AND BOTTOM LINES :
TOP AT -10PX ABOVE THE MIDDLE ONE AND BOTTOM ONE IS 10PX BELOW THE MIDDLE: */
-
+
.hamburger > div::before,
.hamburger > div::after{
content: '';
@@ -346,35 +346,35 @@ blockquote {
height: 2px;
transition: all 0.4s ease;
}
-
+
.hamburger > div::after{
top: 10px;
}
-
+
/* IF THE TOGGLER IS IN ITS CHECKED STATE, THEN SETTING THE BACKGROUND OF THE MIDDLE LAYER TO COMPLETE BLACK AND OPAQUE : */
-
+
.toggler:checked + .hamburger > div{
background: rgba(0,0,0,0); /*Not bothering with var because one-off*/
}
-
+
.toggler:checked + .hamburger > div::before{
top: 0;
transform: rotate(-45deg);
}
-
+
/* AND ROTATING THE TOP AND BOTTOM LINES : */
-
+
.toggler:checked + .hamburger > div::after{
top: 0;
transform: rotate(45deg);
}
-
+
/* MAIN MENU WITH THE WHITE BACKGROUND AND THE TEXT : */
-
+
.main-nav {
-
+
/* APPLYING TRANSITION TO THE MENU : */
-
+
display: flex;
flex-direction: column;
position: fixed;
@@ -384,20 +384,20 @@ blockquote {
background-color: white;
padding: 6rem 2rem 1rem 2rem;
align-items: center;
-
+
/* HIDDEN INITIALLY : */
-
+
visibility: hidden;
}
-
+
.main-nav > a {
margin-top: 15px;
margin-bottom: 15px;
font-size: 2rem;
}
-
+
/* IF THE TOGGLER IS CHECKED, THEN INCREASE THE WIDTH OF THE MENU TO 30% , CREATING A SMOOTH EFFECT : */
-
+
.toggler:checked ~ .main-nav{
visibility: visible;
animation: fadeIn 0.8s ease;