Merge pull request #68 from weaponsforge/dev

v1.0.1
weaponsforge · Mar 4, 2023 · 03869f6 · 03869f6
2 parents 1261503 + 391e070
commit 03869f6
Show file tree

Hide file tree

Showing 29 changed files with 1,167 additions and 250 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -21,6 +21,7 @@ jobs:
       NEXT_PUBLIC_FIREBASE_WEB_APP_ID: ${{ secrets.FIREBASE_WEB_APP_ID_DEV }}
       NEXT_PUBLIC_FIREBASE_WEB_MEASUREMENT_ID: ${{ secrets.FIREBASE_WEB_MEASUREMENT_ID_DEV }}
       NEXT_PUBLIC_MEDIA_BG1: ${{ secrets.NEXT_PUBLIC_MEDIA_BG1 }}
+      NEXT_PUBLIC_RANDOM_JOKE_API: ${{ secrets.NEXT_PUBLIC_RANDOM_JOKE_API }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,6 +21,7 @@ jobs:
       NEXT_PUBLIC_FIREBASE_WEB_APP_ID: ${{ secrets.FIREBASE_WEB_APP_ID_PROD }}
       NEXT_PUBLIC_FIREBASE_WEB_MEASUREMENT_ID: ${{ secrets.FIREBASE_WEB_MEASUREMENT_ID_PROD }}
       NEXT_PUBLIC_MEDIA_BG1: ${{ secrets.NEXT_PUBLIC_MEDIA_BG1 }}
+      NEXT_PUBLIC_RANDOM_JOKE_API: ${{ secrets.NEXT_PUBLIC_RANDOM_JOKE_API }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v3

diff --git a/client/.env.example b/client/.env.example
@@ -6,4 +6,5 @@ NEXT_PUBLIC_FIREBASE_WEB_STORAGE_BUCKET=my-phonebook-dev.appspot.com
 NEXT_PUBLIC_FIREBASE_WEB_MESSAGING_SENDER_ID=240072530372
 NEXT_PUBLIC_FIREBASE_WEB_APP_ID=1:240072530372:web:9bece433da7e2e56b4ec91
 NEXT_PUBLIC_FIREBASE_WEB_MEASUREMENT_ID=G-MYW833GXV6
+NEXT_PUBLIC_RANDOM_JOKE_API=https://v2.jokeapi.dev/joke/Misc?format=json&safe-mode&type=single
 NEXT_PUBLIC_MEDIA_BG1=https://firebasestorage.googleapis.com/v0/b/my-phonebook-pro.appspot.com/o/media%2Fimages%2Fpexels-pixabay-101529.jpg?alt=media&token=24e8132a-8c2e-4c28-bad5-1ab35b82607e
diff --git a/client/README.md b/client/README.md
@@ -50,6 +50,7 @@ The following dependecies are used for this project. Feel free to experiment usi
    | NEXT_PUBLIC_FIREBASE_WEB_APP_ID              | Firebase web web app key from the Firebase Project Settings configuration file.                                                                                                                                                                                                                                                                          |
    | NEXT_PUBLIC_FIREBASE_WEB_MEASUREMENT_ID      | Firebase web measurement ID from the Firebase Project Settings configuration file.                                                                                                                                                                                                                                                                       |
    | NEXT_PUBLIC_MEDIA_BG1                        | Firebase storage download URL of the hi-resolution asset file "loginBgResized.jpg"                                                                                                                                                                                                                                                                       |
+   | NEXT_PUBLIC_RANDOM_JOKE_API                  | Access URL to the JokeAPI, a REST API that serves uniformly and well formatted jokes.                                                                                                                                                                                                                                                                    |
 
 ## Usage
 

diff --git a/client/public/login_FILL0_wght400_GRAD0_opsz48.png b/client/public/login_FILL0_wght400_GRAD0_opsz48.png
diff --git a/client/public/myphonebook-low-resolution-logo-black-on-transparent-background.svg b/client/public/myphonebook-low-resolution-logo-black-on-transparent-background.svg
diff --git a/client/src/common/layout/footer/index.js b/client/src/common/layout/footer/index.js
@@ -1,12 +1,14 @@
-import Box from '@mui/material/Box'
+// MUI
+import Paper from '@mui/material/Paper'
 
+// CSS
 import styles from './styles'
 
 function Footer () {
   return (
-    <Box sx={styles.footer} component='footer'>
-      My Phonebook @2023
-    </Box>
+    <Paper elevation={10} sx={styles.footer} component='footer'>
+      myPhonebook @2023
+    </Paper>
   )
 }
 

diff --git a/client/src/common/layout/footer/styles.js b/client/src/common/layout/footer/styles.js
@@ -4,7 +4,11 @@ const styles = {
     minHeight: (theme) => theme.spacing(4),
     padding: (theme) => theme.spacing(2),
     textAlign: 'center',
-    backgroundColor: (theme) => theme.palette.primary.light
+    marginTop: 'auto',
+    zIndex: 100,
+    background: 'inherit',
+    backdropFilter: 'blur(5px)',
+    fontWeight: 'bold',
   }
 }