Skip to content

Commit

Permalink
Merge pull request #848 from UofT-Frosh-Orientation/fixing-backend-tests
Browse files Browse the repository at this point in the history
Fixing backend tests
  • Loading branch information
gaurikam2003 authored Aug 27, 2024
2 parents 82d63a9 + 79a3055 commit ba7f683
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/backend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ jobs:
- name: Checkout code
uses: actions/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Install Docker Compose
run: |
sudo apt-get update
sudo apt-get install docker-compose -y
- name: Start Docker
run: docker-compose -f docker-compose.test.yml up --build -d

Expand Down
Binary file modified server/src/services/emailAssets/frosh-hard-hat-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server/src/services/emailAssets/frosh-main-logo-outline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions server/src/services/emailAssets/registrationEmail.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
rgba(113, 31, 139, 0.9) 43.23%,
rgba(61, 15, 88, 0.75) 100%
);
color: white;
color: #000000,;
overflow: hidden;
}
.text-container p {
Expand All @@ -65,10 +65,10 @@
</style>
</head>
<body>
<header></header>client\src\assets\logo\main-logo.png
<header></header>
<div class="space-bar"></div>
<div class="content">
<img class="frosh-logo-main" src="../../../../client/src/assets/logo/main-logo.png" alt="frosh logo" />
<img class="frosh-logo-main" src="./frosh-main-logo-outline.png" alt="frosh logo" />
<div class="text-container">
<h1>Hi ${},</h1>
<p><b>Thank you for inputting your information on your Frosh Week 2T4 account!!</b></p>
Expand Down

0 comments on commit ba7f683

Please sign in to comment.