From 6f1e0854e0c4b406903d46e6755ad2eee40f7ad6 Mon Sep 17 00:00:00 2001
From: Belle <bellesee1212@gmail.com>
Date: Sat, 17 Aug 2024 22:28:28 +0800
Subject: [PATCH] fix styling bug + name

---
 components/arcade/showcase/project-view.js    | 34 +++++++++++++++++--
 pages/api/arcade/showcase/projects/my.js      |  2 +-
 pages/arcade/showcase/my.js                   |  2 +-
 .../showcase/project/[projectID]/index.js     | 16 +++++----
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/components/arcade/showcase/project-view.js b/components/arcade/showcase/project-view.js
index 572f7e05..eea9e33e 100644
--- a/components/arcade/showcase/project-view.js
+++ b/components/arcade/showcase/project-view.js
@@ -1,5 +1,6 @@
 import styles from './project-view.module.css'
-import { Button } from 'theme-ui'
+import { Button, Text } from 'theme-ui'
+import Icon from '@hackclub/icons'
 /** @jsxImportSource theme-ui */
 
 const ProjectView = ({
@@ -20,9 +21,36 @@ const ProjectView = ({
     : 'View project source'
   return (
     <div {...props} className="gaegu" sx={{ position: 'relative' }}>
-      <div sx={{ py: 4, backgroundColor: '#F4E7C7', textAlign: 'center' }}>
-        <h1 className="slackey">{title}</h1>
+      <div sx={{ py: 4, backgroundColor: '#F4E7C7', textAlign: 'center', color: '#333' }}>
+        <h1 className="slackey" sx={{color: '#FF5C00'}}>{title}</h1>
         <h3>By {user}</h3>
+        <Text
+      as="a"
+      href="/arcade/showcase/my"
+        sx={{
+          border: '2px dashed #333',
+          borderRadius: '5px',
+          position: ['relative', 'relative', 'absolute'],
+          display: 'flex',
+          left: '10px',
+          top: '10px',
+          justifyContent: 'center',
+          alignItems: 'center',
+          px: 2,
+          py: 1,
+          transitionDuration: '0.4s',
+          cursor: 'pointer',
+          textDecoration: 'none',
+          mb: 3,
+          color: '#333',
+          '&:hover': {
+            background: '#333',
+            color: '#F4E7C7'
+          }
+        }}
+      >
+        <Icon glyph="home" /> View all my ships
+      </Text>
       </div>
 
       <div
diff --git a/pages/api/arcade/showcase/projects/my.js b/pages/api/arcade/showcase/projects/my.js
index 61d7df53..2573c26e 100644
--- a/pages/api/arcade/showcase/projects/my.js
+++ b/pages/api/arcade/showcase/projects/my.js
@@ -29,5 +29,5 @@ export default async function handler(req, res) {
     githubProf: p.fields['Github Profile'] || '',
     user: user.fields['Name']
   }))
-  return res.status(200).json({ projects: results })
+  return res.status(200).json({ projects: results, name: user.fields['Name']})
 }
\ No newline at end of file
diff --git a/pages/arcade/showcase/my.js b/pages/arcade/showcase/my.js
index 1dfd8225..d825bc31 100644
--- a/pages/arcade/showcase/my.js
+++ b/pages/arcade/showcase/my.js
@@ -264,7 +264,7 @@ const my = () => {
               }}
             >
               <Text className="gaegu" sx={{ color: '#FF5C00' }}>
-                {status == 'success' ? `Welcome, ${projects.user}` : ''}
+                {status == 'success' ? `Welcome, ${name}` : ''}
                 
               </Text>
 
diff --git a/pages/arcade/showcase/project/[projectID]/index.js b/pages/arcade/showcase/project/[projectID]/index.js
index 6b60b5e7..254abfc6 100644
--- a/pages/arcade/showcase/project/[projectID]/index.js
+++ b/pages/arcade/showcase/project/[projectID]/index.js
@@ -4,7 +4,8 @@ import Nav from '../../../../../components/Nav'
 import Footer from '../../../../../components/arcade/Footer'
 import BGImg from '../../../../../components/background-image'
 import styles from '../../../../../components/arcade/showcase/project-view.module.css'
-import { Box } from 'theme-ui'
+import { Box, Text } from 'theme-ui'
+import Icon from '@hackclub/icons'
 /** @jsxImportSource theme-ui */
 
 const styled = `
@@ -118,20 +119,21 @@ const ProjectShowPage = ({ projectID }) => {
             maxWidth: '200px',
             position: 'absolute',
             top: '20px',
-            right: '20px'
+            right: '20px',
+            zIndex: 10
           }}
         />
         <div className={styles.min}>
-          {
+          {/* {
         status == 'loading' && <Loading />
       }
 
       {
         status == 'error' && <ErrorMessage />
-      }
+      } */}
 
-      {
-        status == 'success' && 
+      {/* {
+        status == 'success' &&  */}
         <ProjectView
           key={project.id}
           id={project.id}
@@ -144,7 +146,7 @@ const ProjectShowPage = ({ projectID }) => {
           githubProf={project.githubProf}
           user={project.user}
         />
-      }
+      {/* } */}
         </div>
       </div>
       <style>{styled}</style>