Merge pull request #1002 from thecourseforum/dev

Add new grade data from fall 2024

Author: ayung0

.gitattributes

@@ -1,6 +1,6 @@
 # tCF Developer Info
 
-Ensure your system has [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [git-lfs](https://git-lfs.com/) and [Docker](https://docs.docker.com/install/) installed.
+Ensure your system has [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [git-lfs](https://git-lfs.com/), [Docker](https://docs.docker.com/install/), and [gdown](https://github.com/wkentaro/gdown) installed.
 
 ## One-Command Setup
 
@@ -35,7 +35,7 @@ $ docker compose up --build
 ```
 
 4. Wait for the Django server to finish building (i.e. `tcf_django | Watching for file changes with StatReloader` is visible in stdout).
-5. Download and place the [latest database backup](https://drive.google.com/drive/u/0/folders/1a7OkHkepOBWKiDou8nEhpAG41IzLi7mh) from Google Drive into `db/latest.sql` in your local repo.
+5. Download and place the [latest database backup](https://drive.google.com/drive/u/0/folders/1a7OkHkepOBWKiDou8nEhpAG41IzLi7mh) (should be named `latest.sql`) from Google Drive into `db/latest.sql` in your local repo.
 6. Update the database:
 
 MacOS/Linux (or Windows, if you're using Git-Bash):

doc/dev.md

@@ -22,4 +22,4 @@ requests~=2.31.0
 social-auth-app-django~=5.4.0
 tqdm~=4.66.1
 types-tqdm~=4.66.0
-uWSGI~=2.0.23
+uWSGI~=2.0.28

requirements.txt

@@ -5,6 +5,8 @@ if [ -z "$1" ]; then
   exit
 fi
 
+cd "$1" || exit
+
 exists() {
   command -v "$1" >/dev/null 2>&1 || {
     echo "Error: '$1' is not installed. Please install '$1'." >&2
@@ -16,6 +18,8 @@ exists git
 
 exists docker
 
+exists gdown # check for gdown
+
 git clone git@github.com:thecourseforum/theCourseForum2.git
 if [ "$?" -ne 0 ]; then
   echo "Unable to clone thecourseforum/theCourseForum2 with SSH. Ensure you have an ssh key set up on your GitHub account."
@@ -39,11 +43,25 @@ read -r _ </dev/tty
 
 [ ! -f ".env" ] && echo "Error: '.env' file does not exist in '$1'. Follow the installation instructions in doc/dev.md after creating a '.env' file." && exit 1
 
+GDRIVE_FILE_ID="1TsSvhvWGA24537xNo_9CkULKzjugNrZH"
+SQL_FILE_PATH="db/latest.sql"
+
+echo "Downloading $SQL_FILE_PATH from Google Drive..."
+
+# use gdown to download latest.sql
+gdown "$GDRIVE_FILE_ID" --output "$SQL_FILE_PATH"
+if [ "$?" -ne 0 ]; then
+  echo "Failed to download $SQL_FILE_PATH from Google Drive."
+  echo "Make sure the file is publicly accessible or you have proper permissions."
+  exit 1
+fi
+
 docker compose build --no-cache
 docker compose up &
 (
-  sleep 1
+  sleep 3 # 1 to 3 to ensure containers are up
   docker exec -i tcf_db psql tcf_db -U tcf_django -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
   docker exec -i tcf_db psql tcf_db -U tcf_django -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-  docker exec -i tcf_db psql tcf_db -U tcf_django <db/latest.sql
+  echo "Importing data from $SQL_FILE_PATH..."
+  docker exec -i tcf_db psql tcf_db -U tcf_django < "$SQL_FILE_PATH"
 ) &

scripts/setup.sh

@@ -318,25 +318,25 @@ <h5>Follow
                             <li class="list-inline-item mr-3"
                                 style="display: inline-block; vertical-align: middle; transform: translateY(0.00rem);">
                                 <a href="https://discord.gg/tAjzH7eyvW">
-                                    <i class="fab fa-discord fa-2x fa-fw"></i>
+                                    <i class="fab fa-discord fa-2x fa-fw" style="width: 1.5em; height: 1.5em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
                                 </a>
                             </li>
                             <li class="list-inline-item mr-3"
                                 style="display: inline-block; vertical-align: middle; transform: translateY(0.00rem);">
                                 <a href="https://www.facebook.com/thecourseforum">
-                                    <i class="fab fa-facebook fa-2x fa-fw"></i>
+                                    <i class="fab fa-facebook fa-2x fa-fw" style="width: 1.5em; height: 1.5em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
                                 </a>
                             </li>
                             <li class="list-inline-item mr-3"
                                 style="display: inline-block; vertical-align: middle; transform: translateY(0.00rem);">
                                 <a href="https://www.instagram.com/thecourseforum_uva/">
-                                    <i class="fab fa-instagram fa-2x fa-fw"></i>
+                                    <i class="fab fa-instagram fa-2x fa-fw" style="width: 1.5em; height: 1.5em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
                                 </a>
                             </li>
                             <li class="list-inline-item"
                                 style="display: inline-block; vertical-align: middle; transform: translateY(0.00rem);">
                                 <a href="https://twitter.com/thecourseforum">
-                                    <i class="fab fa-twitter-square fa-2x fa-fw"></i>
+                                    <i class="fab fa-twitter-square fa-2x fa-fw" style="width: 1.5em; height: 1.5em; vertical-align: middle; display: inline-block; filter: invert(100%) brightness(150%);"></i>
                                 </a>
                             </li>
                         </ul>

tcf_website/management/commands/grade_data/csv/2024_fall.csv

@@ -221,6 +221,13 @@
       "img_filename": "ENG_Visvajit_Murali.jpg",
       "github": "visva-murali"
     },
+    {
+      "name": "Angad Brar",
+      "role": "Developer",
+      "class": "2027",
+      "img_filename": "ENG_Angad_Brar.jpg",
+      "github": "angadv12"
+    },
     {
       "name": "Grace Kang",
       "role": "Developer",