Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing backend tests #848

Merged
merged 40 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6f75d03
Merge pull request #777 from UofT-Frosh-Orientation/alissaLandingBranch
ashleyleal Jun 20, 2024
ac282d0
Merge branch 'dev' into prod
gaurikam2003 Jun 26, 2024
f1fc68b
Merge branch 'dev' into prod
gaurikam2003 Jun 26, 2024
7d82b83
Merge pull request #785 from UofT-Frosh-Orientation/dev
gaurikam2003 Jun 28, 2024
4319910
Merge pull request #801 from UofT-Frosh-Orientation/dev
ashleyleal Jul 4, 2024
2fdcb59
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
149987e
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
6391975
Merge pull request #804 from UofT-Frosh-Orientation/dev
ashleyleal Jul 5, 2024
dd6372e
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
053d9bd
trying out a new discount code
gaurikam2003 Jul 5, 2024
6533692
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
2724b2f
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
9a747cb
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
32a03e7
changed sizing of images for emails
gaurikam2003 Jul 5, 2024
0a2ed54
changed email text color
gaurikam2003 Jul 5, 2024
fa770e1
changed font color for email to black
gaurikam2003 Jul 5, 2024
6e8ac51
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
7d80f60
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
73b59fc
Merge branch 'dev' into prod
gaurikam2003 Jul 5, 2024
1257d65
Merge branch 'dev' into prod
gaurikam2003 Jul 6, 2024
2b4207c
Merge branch 'dev' into prod
gaurikam2003 Jul 9, 2024
95cc9a9
Merge branch 'dev' into prod
gaurikam2003 Jul 12, 2024
8180a43
Merge branch 'dev' into prod
gaurikam2003 Jul 12, 2024
012d1b2
Merge pull request #817 from UofT-Frosh-Orientation/dev
ashleyleal Jul 17, 2024
b42883f
Merge branch 'dev' into prod
gaurikam2003 Jul 18, 2024
ff3ab3d
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
68db87a
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
77e7286
add isRetreat to userModel
ashleyleal Jul 31, 2024
b226fd6
fix upload waiver not working if attendingRetreat left blank
ashleyleal Jul 31, 2024
9dcdbce
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
3f03ea5
Merge branch 'prod' of https://github.com/UofT-Frosh-Orientation/orie…
gaurikam2003 Jul 31, 2024
1b35531
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
2ed31f5
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
5e854bd
Merge branch 'dev' into prod
gaurikam2003 Jul 31, 2024
e09cc35
Merge branch 'dev' into prod
gaurikam2003 Aug 18, 2024
b2339aa
Merge branch 'dev' into prod
gaurikam2003 Aug 24, 2024
59eee3c
Merge branch 'dev' into prod
gaurikam2003 Aug 26, 2024
7f5c445
Merge branch 'dev' into prod
gaurikam2003 Aug 26, 2024
784d7c8
Merge branch 'dev' into prod
gaurikam2003 Aug 27, 2024
79a3055
changing up backend_tests file to include install
gaurikam2003 Aug 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading