Merge branch 'main' into 281_Lesson10

uclaacm · Oct 18, 2023 · cdfcf43 · cdfcf43
2 parents 524da47 + 5190160
commit cdfcf43
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/src/components/Terminal.tsx b/src/components/Terminal.tsx
@@ -24,9 +24,14 @@ export default function Terminal(props: TerminalProps): JSX.Element {
 
   return (
     <div>
-      <div className={alert ? 'copyalert fadeout' : 'hiddenalert'}>
-        <p>Copied to Clipboard</p>
-      </div>
+      {alert ? (
+        <div className={alert ? 'copyalert fadeout' : 'hiddenalert'}>
+          <p>Copied to Clipboard</p>
+        </div>
+      ) : (
+        <></>
+      )}
+
       <div className="terminal">
         <CopyToClipboard
           text={props.code}

diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
@@ -17,10 +17,11 @@ const Home: FC = () => {
             <div id="col-1">
               <h1 id="title">Parcel Pointers</h1>
               <p id="description">
-                Lorem ipsum dolor sit amet, consecteur adipiscing elit, sed do
-                eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut
-                enim ad minim vernian, quis nostrud exercitation ullamco laboris
-                nisi ut aliquip ex ea commodo consequat.
+                Welcome to Parcel Pointers! This learning lab is designed to
+                help you learn everything about pointers and how they are used
+                by following our robot Pipi through a warehouse. By the end of
+                the learning lab, hopefully you should know how and where to use
+                pointers in your own projects!
               </p>
               <button
                 id="start-button"

diff --git a/src/styles/CodeDiagram.scss b/src/styles/CodeDiagram.scss
@@ -53,10 +53,15 @@
   margin: 0.5em;
   padding: 5px 10px;
   width: fit-content;
+
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 .arrow {
   position: relative;
+  width: 50%;
 }
 
 @media screen and (max-width: 1024px) {

diff --git a/src/styles/Terminal/Terminal.scss b/src/styles/Terminal/Terminal.scss
@@ -30,11 +30,12 @@
   border-color: black;
   display: flex;
   justify-content: center;
-  left: 40vw;
+  left: 50%;
   padding: 1em;
   position: fixed;
-  right: 40vw;
   top: 7.5vh;
+  transform: translateX(-50%);
+  width: max-content;
 }
 
 @keyframes fadeout {

diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts
@@ -4,7 +4,7 @@
 */
 export enum HeaderSections {
   LANDING_SECTION = 'landingSection',
-  TITLE_SECTION = 'titleSection',
+  TITLE_SECTION = 'Parcel Pointers',
   LEARNING_SECTION = 'learningSection',
   CODE_SECTION = 'codeSection',
   DEMO_SECTION = 'Demo',

diff --git a/yarn.lock b/yarn.lock
@@ -7548,4 +7548,4 @@ yaml@^1.10.0:
 
 yargs-parser@^20.2.1, yargs-parser@^20.2.3:
   version "20.2.9"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"