Added error pages

h00s · May 16, 2024 · dcbc684 · dcbc684
1 parent 12b0631
commit dcbc684
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 1 deletion.
diff --git a/backend/app/controllers/links_controller.go b/backend/app/controllers/links_controller.go
@@ -32,7 +32,12 @@ func (lc *LinksController) Get(c *raptor.Context) error {
 func (lc *LinksController) Redirect(c *raptor.Context) error {
 	link, err := lc.Links.GetByShortID(c.Params("shortID"))
 	if err != nil {
-		return c.JSONError(err)
+		if raptorErr, ok := err.(*raptor.Error); ok {
+			if raptorErr.Code == http.StatusNotFound {
+				return c.Redirect("/errors/404")
+			}
+		}
+		return c.Redirect("/errors/500")
 	}
 	if link.Password != "" {
 		return c.Redirect(fmt.Sprintf("/links/%s/authorize", c.Params("shortID")))

diff --git a/frontend/src/routes/errors/404/+page.js b/frontend/src/routes/errors/404/+page.js
diff --git a/frontend/src/routes/errors/404/+page.svelte b/frontend/src/routes/errors/404/+page.svelte
@@ -0,0 +1,15 @@
+<script>
+  import HeaderContainer from '$lib/components/HeaderContainer.svelte'
+  import Privacy from '$lib/components/Privacy.svelte'
+  import Footer from '$lib/components/Footer.svelte'
+</script>
+
+<HeaderContainer>
+  <h2 class="pt-4 pb-4 text-4xl font-extrabold text-center">
+    404
+  </h2>
+  <p class="text-center pb-8 text-light-green">Skraćeni link ne postoji, istekao je ili je obrisan.</p>
+</HeaderContainer>
+
+<Privacy />
+<Footer />
diff --git a/frontend/src/routes/errors/500/+page.js b/frontend/src/routes/errors/500/+page.js
diff --git a/frontend/src/routes/errors/500/+page.svelte b/frontend/src/routes/errors/500/+page.svelte
@@ -0,0 +1,15 @@
+<script>
+  import HeaderContainer from '$lib/components/HeaderContainer.svelte'
+  import Privacy from '$lib/components/Privacy.svelte'
+  import Footer from '$lib/components/Footer.svelte'
+</script>
+
+<HeaderContainer>
+  <h2 class="pt-4 pb-4 text-4xl font-extrabold text-center">
+    500
+  </h2>
+  <p class="text-center pb-8 text-light-green">Ups, nešto je pošlo po krivu. Pokušajte ponovo kasnije...</p>
+</HeaderContainer>
+
+<Privacy />
+<Footer />
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
@@ -3,6 +3,9 @@ export default {
   content: ['./src/**/*.{html,js,svelte,ts}'],
   theme: {
     extend: {
+      fontSize: {
+        '4xl': '5rem',
+      },
       colors: {
         'background-dark': '#011627',
         'background-light': '#fff',