-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #934 from sgfost/deps/typeorm-0.3.x
upgrade typeorm to 0.3.x and clean up config + build
- Loading branch information
Showing
70 changed files
with
1,268 additions
and
876 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
client/node_modules | ||
server/node_modules | ||
server/deploy/Dockerfile* | ||
server/Dockerfile.dev | ||
server/Dockerfile.prod | ||
server/output | ||
docker | ||
keys |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,25 +64,25 @@ [email protected] | |
<h2>Connect with Us</h2> | ||
<ul> | ||
<li> | ||
<a :href="constants.DISCORD_URL" title="Discord"> | ||
<a :href="$settings.DISCORD_URL" title="Discord"> | ||
Discord | ||
<b-icon-discord></b-icon-discord> | ||
</a> | ||
</li> | ||
<li> | ||
<a :href="'mailto:' + constants.CONTACT_EMAIL" title="Email us"> | ||
<a :href="'mailto:' + $settings.CONTACT_EMAIL" title="Email us"> | ||
<b-icon-envelope class="mx-1"></b-icon-envelope> | ||
</a> | ||
</li> | ||
<li> | ||
<a :href="constants.INSTAGRAM_URL" title="Instagram"> | ||
<a :href="$settings.INSTAGRAM_URL" title="Instagram"> | ||
<b-icon-instagram class="mx-1"></b-icon-instagram> | ||
</a> | ||
</li> | ||
<li> | ||
<a :href="constants.TWITTER_URL" title="Twitter"> | ||
<a :href="$settings.TWITTER_URL" title="Twitter"> | ||
<b-icon-twitter class="mx-1"></b-icon-twitter> | ||
</a> | ||
|
@@ -93,15 +93,14 @@ [email protected] | |
© 2020-{{ currentYear }} | ||
<a href="https://www.azregents.edu/">Arizona Board of Regents</a> | | ||
|
||
<a :href="constants.GITHUB_URL">{{ constants.BUILD_ID }}</a> | ||
<a :href="$settings.GITHUB_URL">{{ RELEASE_VERSION }}</a> | ||
</div> | ||
</footer> | ||
<!-- </b-container> --> | ||
</template> | ||
|
||
<script lang="ts"> | ||
import { Component, Vue } from "vue-property-decorator"; | ||
import { Constants } from "@port-of-mars/shared/settings"; | ||
import { | ||
LOGIN_PAGE, | ||
FREE_PLAY_LOBBY_PAGE, | ||
|
@@ -123,8 +122,8 @@ export default class Footer extends Vue { | |
privacy = { name: PRIVACY_PAGE }; | ||
solo = { name: SOLO_GAME_PAGE }; | ||
get constants() { | ||
return Constants; | ||
get RELEASE_VERSION() { | ||
return import.meta.env.SHARED_RELEASE_VERSION; | ||
} | ||
get isTournamentEnabled() { | ||
|
Oops, something went wrong.