Merge branch 'master' of https://github.com/anthonyhardman/project_aspen

SnowSE · Oct 4, 2023 · d4b7fc8 · d4b7fc8
2 parents 4bd22a0 + 5c61118
commit d4b7fc8
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 273 deletions.
diff --git a/src/v2/.devcontainer/Dockerfile b/src/v2/.devcontainer/Dockerfile
@@ -3,8 +3,8 @@ FROM almalinux:latest
 RUN dnf -y install \
     openssh-clients \
     nodejs \
-    openldap-devel \
-    rm -rf /var/cache/yum && \z
+    openldap-devel && \
+    rm -rf /var/cache/yum && \
     npm i -g n && \
     n 16
 

diff --git a/src/v2/api/api/Models/Entities/Donation.cs b/src/v2/api/api/Models/Entities/Donation.cs
diff --git a/src/v2/api/api/Models/Entities/Event.cs b/src/v2/api/api/Models/Entities/Event.cs
diff --git a/src/v2/api/api/Models/Entities/Link.cs b/src/v2/api/api/Models/Entities/Link.cs
diff --git a/src/v2/api/api/Models/Entities/LinkRecord.cs b/src/v2/api/api/Models/Entities/LinkRecord.cs
diff --git a/src/v2/api/api/Models/Entities/PaymentFailure.cs b/src/v2/api/api/Models/Entities/PaymentFailure.cs
diff --git a/src/v2/api/api/Models/Entities/Person.cs b/src/v2/api/api/Models/Entities/Person.cs
diff --git a/src/v2/api/api/Models/Entities/PersonTeamAssociation.cs b/src/v2/api/api/Models/Entities/PersonTeamAssociation.cs
diff --git a/src/v2/api/api/Models/Entities/Team.cs b/src/v2/api/api/Models/Entities/Team.cs
diff --git a/src/v2/client/.env b/src/v2/client/.env
@@ -0,0 +1,3 @@
+BROWSER=none
+REACT_APP_AUTH_URL=https://engineering.snow.edu/aspen/auth
+REACT_APP_BASE_URL=https://localhost:44478/aspen/new