new struc & update

Ujstor · Jan 5, 2024 · f974f34 · f974f34
1 parent 1ca88f5
commit f974f34
Show file tree

Hide file tree

Showing 33 changed files with 10 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
 
     environment {
         GITHUB_USER = 'ujstor'
-        GITHUB_REPO = 'portfolio_web'
+        GITHUB_REPO = 'portfolio-web'
         DOCKER_HUB_USERNAME = 'ujstor'
         DOCKER_REPO_NAME = 'portfolio-web-go'
         BRANCH = 'master'

diff --git a/website/static/css/main.css → cmd/web/static/css/main.css b/website/static/css/main.css → cmd/web/static/css/main.css
diff --git a/website/static/fonts/devicon.ttf → cmd/web/static/fonts/devicon.ttf b/website/static/fonts/devicon.ttf → cmd/web/static/fonts/devicon.ttf
diff --git a/website/static/fonts/devicon.woff → cmd/web/static/fonts/devicon.woff b/website/static/fonts/devicon.woff → cmd/web/static/fonts/devicon.woff
diff --git a/website/static/fonts/fontawesome-webfont.ttf → cmd/web/static/fonts/fontawesome-webfont.ttf b/website/static/fonts/fontawesome-webfont.ttf → cmd/web/static/fonts/fontawesome-webfont.ttf
diff --git a/...ite/static/fonts/fontawesome-webfont.woff → ...web/static/fonts/fontawesome-webfont.woff b/...ite/static/fonts/fontawesome-webfont.woff → ...web/static/fonts/fontawesome-webfont.woff
diff --git a/...te/static/fonts/fontawesome-webfont.woff2 → ...eb/static/fonts/fontawesome-webfont.woff2 b/...te/static/fonts/fontawesome-webfont.woff2 → ...eb/static/fonts/fontawesome-webfont.woff2
diff --git a/website/static/img/favicon.ico → cmd/web/static/img/favicon.ico b/website/static/img/favicon.ico → cmd/web/static/img/favicon.ico
diff --git a/cmd/web/static/img/jpg/blueprint.png b/cmd/web/static/img/jpg/blueprint.png
diff --git a/website/static/img/jpg/fastapi.png → cmd/web/static/img/jpg/fastapi.png b/website/static/img/jpg/fastapi.png → cmd/web/static/img/jpg/fastapi.png
diff --git a/website/static/img/jpg/models.png → cmd/web/static/img/jpg/models.png b/website/static/img/jpg/models.png → cmd/web/static/img/jpg/models.png
diff --git a/website/static/img/jpg/probit.png → cmd/web/static/img/jpg/probit.png b/website/static/img/jpg/probit.png → cmd/web/static/img/jpg/probit.png
diff --git a/website/static/img/jpg/streamlit.png → cmd/web/static/img/jpg/streamlit.png b/website/static/img/jpg/streamlit.png → cmd/web/static/img/jpg/streamlit.png
diff --git a/cmd/web/static/img/webp/blueprint.webp b/cmd/web/static/img/webp/blueprint.webp
diff --git a/website/static/img/webp/fastapi.webp → cmd/web/static/img/webp/fastapi.webp b/website/static/img/webp/fastapi.webp → cmd/web/static/img/webp/fastapi.webp
diff --git a/website/static/img/webp/models.webp → cmd/web/static/img/webp/models.webp b/website/static/img/webp/models.webp → cmd/web/static/img/webp/models.webp
diff --git a/website/static/img/webp/probit.webp → cmd/web/static/img/webp/probit.webp b/website/static/img/webp/probit.webp → cmd/web/static/img/webp/probit.webp
diff --git a/website/static/img/webp/streamlit.webp → cmd/web/static/img/webp/streamlit.webp b/website/static/img/webp/streamlit.webp → cmd/web/static/img/webp/streamlit.webp
diff --git a/website/static/js/main.js → cmd/web/static/js/main.js b/website/static/js/main.js → cmd/web/static/js/main.js
diff --git a/website/static/js/sweet-scroll.min.js → cmd/web/static/js/sweet-scroll.min.js b/website/static/js/sweet-scroll.min.js → cmd/web/static/js/sweet-scroll.min.js
diff --git a/website/static/js/typed.js → cmd/web/static/js/typed.js b/website/static/js/typed.js → cmd/web/static/js/typed.js
diff --git a/website/static/resume_23.pdf → cmd/web/static/resume_23.pdf b/website/static/resume_23.pdf → cmd/web/static/resume_23.pdf
diff --git a/website/static/svg/aws.svg → cmd/web/static/svg/aws.svg b/website/static/svg/aws.svg → cmd/web/static/svg/aws.svg
diff --git a/website/static/svg/hetzner.svg → cmd/web/static/svg/hetzner.svg b/website/static/svg/hetzner.svg → cmd/web/static/svg/hetzner.svg
diff --git a/website/static/svg/postman.svg → cmd/web/static/svg/postman.svg b/website/static/svg/postman.svg → cmd/web/static/svg/postman.svg
diff --git a/website/static/svg/streamlit.svg → cmd/web/static/svg/streamlit.svg b/website/static/svg/streamlit.svg → cmd/web/static/svg/streamlit.svg
diff --git a/website/static/svg/traefik.svg → cmd/web/static/svg/traefik.svg b/website/static/svg/traefik.svg → cmd/web/static/svg/traefik.svg
diff --git a/website/templates/index.html → cmd/web/templates/index.html b/website/templates/index.html → cmd/web/templates/index.html
@@ -305,7 +305,7 @@ <h3>Social Media FastAPI</h3>
     </section> 
 
     <footer class="footer">
-      <p>&copy; Aleksandar Stipan, 2023</p>
+      <p>&copy; Aleksandar Stipan, 2024</p>
     </footer>
 
     <!-- Import JS: Particles Theme -->
@@ -315,4 +315,4 @@ <h3>Social Media FastAPI</h3>
     <!-- Import JS: Main Script -->
     <script src="./static/js/main.js"></script>
   </body>
-</html>
+</html>
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -1,7 +1,7 @@
-version: '3'
+version: '3.8'
 
 services:
   web:
-    image: ujstor/portfolio-web-go:1.0.6
+    image: ujstor/portfolio-web-go:1.0.7
     ports:
-      - '${PORT}:${PORT}'
+      - ${PORT}:${PORT}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
-version: '3'
+version: '3.8'
 
 services:
   web:
     build: .
     ports:
-      - '${PORT}:${PORT}'
+      - ${PORT}:${PORT}
diff --git a/internal/server/routes.go b/internal/server/routes.go
@@ -5,9 +5,9 @@ import (
 )
 
 func (s *FiberServer) RegisterFiberRoutes() {
-	s.App.Static("/", "./website/templates")
+	s.App.Static("/", "./cmd/web/templates")
 
-	s.App.Static("/static", "./website/static")
+	s.App.Static("/static", "./cmd/web/static")
 
 	// 404 handler for all other routes
 	s.App.Use(func(c *fiber.Ctx) error {

diff --git a/website/static/img/jpg/blueprint.png b/website/static/img/jpg/blueprint.png
diff --git a/website/static/img/webp/blueprint.webp b/website/static/img/webp/blueprint.webp