Skip to content

Commit f869d80

Browse files
EntroperEntroper
authored
Merge pull request #322 from FiendsOfTheElements/dev
3.0
2 parents a6e768e + 30170f8 commit f869d80

191 files changed

Lines changed: 13004 additions & 95648 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 25 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -14,131 +14,53 @@ jobs:
1414
- run:
1515
name: publish
1616
command: |
17-
cd FF1RandomizerOnline
17+
set -ex
18+
cd FF1Blazorizer
1819
if [ "${CIRCLE_BRANCH}" == "master" ]; then
1920
dotnet publish -c Release
20-
git rev-parse HEAD > bin/Release/netcoreapp2.1/publish/version.txt
21+
git rev-parse HEAD > bin/Release/netstandard2.0/publish/FF1Blazorizer/dist/version.txt
2122
else
2223
dotnet publish -c Debug
23-
git rev-parse HEAD > bin/Debug/netcoreapp2.1/publish/version.txt
24+
git rev-parse HEAD > bin/Debug/netstandard2.0/publish/FF1Blazorizer/dist/version.txt
2425
fi
2526
- persist_to_workspace:
2627
root: ~/ff1randomizer
27-
paths: FF1RandomizerOnline
28+
paths:
29+
- FF1Blazorizer
2830

29-
dockerize_production:
31+
deploy:
3032
<<: *defaults
3133
steps:
32-
- setup_remote_docker
33-
- attach_workspace:
34-
at: ~/ff1randomizer
35-
- run:
36-
name: docker
37-
command: |
38-
cd FF1RandomizerOnline && \
39-
docker login -u $DOCKER_USER -p $DOCKER_PASS && \
40-
docker build -t entroper/finalfantasyrandomizer:latest -f Dockerfile . && \
41-
docker push entroper/finalfantasyrandomizer:latest
42-
43-
dockerize_beta:
44-
<<: *defaults
45-
steps:
46-
- setup_remote_docker
47-
- attach_workspace:
48-
at: ~/ff1randomizer
49-
- run:
50-
name: docker
51-
command: |
52-
cd FF1RandomizerOnline && \
53-
docker login -u $DOCKER_USER -p $DOCKER_PASS && \
54-
docker build -t entroper/finalfantasyrandomizer:beta -f Dockerfile.debug . && \
55-
docker push entroper/finalfantasyrandomizer:beta
56-
57-
dockerize_alpha:
58-
<<: *defaults
59-
steps:
60-
- setup_remote_docker
34+
- checkout
6135
- attach_workspace:
6236
at: ~/ff1randomizer
63-
- run:
64-
name: docker
65-
command: |
66-
cd FF1RandomizerOnline && \
67-
docker login -u $DOCKER_USER -p $DOCKER_PASS && \
68-
docker build -t entroper/finalfantasyrandomizer:alpha -f Dockerfile.debug . && \
69-
docker push entroper/finalfantasyrandomizer:alpha
70-
71-
deploy_production:
72-
<<: *defaults
73-
steps:
74-
- checkout
75-
- run:
76-
name: deploy
77-
command: |
78-
mkdir -p ~/.ssh && \
79-
cp .ssh/known_hosts ~/.ssh/known_hosts && \
80-
ssh circle@finalfantasyrandomizer.com "./deployff1r.sh master"
81-
82-
deploy_beta:
83-
<<: *defaults
84-
steps:
85-
- checkout
86-
- run:
87-
name: deploy
88-
command: |
89-
mkdir -p ~/.ssh && \
90-
cp .ssh/known_hosts ~/.ssh/known_hosts && \
91-
ssh circle@finalfantasyrandomizer.com "./deployff1r.sh dev"
92-
93-
deploy_alpha:
94-
<<: *defaults
95-
steps:
96-
- checkout
9737
- run:
9838
name: deploy
9939
command: |
100-
mkdir -p ~/.ssh && \
101-
cp .ssh/known_hosts ~/.ssh/known_hosts && \
102-
ssh circle@finalfantasyrandomizer.com "./deployff1r.sh alpha"
40+
set -ex
41+
mkdir -p ~/.ssh
42+
cp .ssh/known_hosts ~/.ssh/known_hosts
43+
if [ "${CIRCLE_BRANCH}" == "master" ]; then
44+
pushd FF1Blazorizer/bin/Release/netstandard2.0/publish/FF1Blazorizer/dist
45+
else
46+
pushd FF1Blazorizer/bin/Debug/netstandard2.0/publish/FF1Blazorizer/dist
47+
fi
48+
tar cvzf ../../../../../../../FF1Blazorizer.tar.gz .
49+
popd
50+
scp FF1Blazorizer.tar.gz circle@finalfantasyrandomizer.com:FF1Blazorizer.tar.gz
51+
ssh circle@finalfantasyrandomizer.com "./deployff1rblazor.sh $CIRCLE_BRANCH"
10352
10453
workflows:
10554
version: 2
10655
main:
10756
jobs:
10857
- build
109-
- dockerize_production:
110-
requires:
111-
- build
112-
filters:
113-
branches:
114-
only: master
115-
- dockerize_beta:
58+
- deploy:
11659
requires:
11760
- build
11861
filters:
11962
branches:
120-
only: dev
121-
- dockerize_alpha:
122-
requires:
123-
- build
124-
filters:
125-
branches:
126-
only: alpha
127-
- deploy_production:
128-
requires:
129-
- dockerize_production
130-
filters:
131-
branches:
132-
only: master
133-
- deploy_beta:
134-
requires:
135-
- dockerize_beta
136-
filters:
137-
branches:
138-
only: dev
139-
- deploy_alpha:
140-
requires:
141-
- dockerize_alpha
142-
filters:
143-
branches:
144-
only: alpha
63+
only:
64+
- master
65+
- dev
66+
- alpha

‎.editorconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ indent_size = 4
99
indent_style = tab
1010
end_of_line = crlf
1111

12-
[*.{csproj,yml,yaml}]
12+
[*.{csproj}]
1313
indent_size = 2
1414
indent_style = space
15+
end_of_line = crlf
16+
17+
[*.{yml,yaml}]
18+
indent_size = 2
19+
indent_style = space
20+
end_of_line = lf
1521

1622
[*.{js,json}]
1723
indent_size = 4

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,3 +246,6 @@ _Pvt_Extensions
246246
# Archives
247247
*.zip
248248
*.tar.gz
249+
250+
# IDEA files (Rider IDE, Pycharm, etc)
251+
.idea/

‎FF1Blazorizer/FF1Blazorizer.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,15 @@
77
<LangVersion>7.3</LangVersion>
88
</PropertyGroup>
99

10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
12+
<WarningsAsErrors />
13+
</PropertyGroup>
14+
1015
<ItemGroup>
16+
<PackageReference Include="Blazor.Extensions.Storage" Version="0.1.7" />
1117
<PackageReference Include="BlazorStrap" Version="0.6.1" />
18+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.0.0" />
1219
<PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
1320
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" PrivateAssets="all" />
1421
<DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0" />
@@ -31,6 +38,9 @@
3138
<Content Update="wwwroot\presets\full-npc.json">
3239
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3340
</Content>
41+
<Content Update="wwwroot\presets\chaos-rush.json">
42+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
43+
</Content>
3444
<Content Update="wwwroot\presets\improved-vanilla.json">
3545
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3646
</Content>

‎FF1Blazorizer/Pages/Index.cshtml‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
@page "/"
22

3-
<h1>Hello, world!</h1>
4-
5-
Welcome to your new app.
6-
7-
<SurveyPrompt Title="How is Blazor working for you?" />
3+
<div id="welcome" class="content px-4">
4+
<h1>Final Fantasy Randomizer<br />Version @FF1Lib.FF1Rom.Version</h1>
5+
<p>We've found the TAIL and we're promoting the Website!</p>
6+
<div class="col-md-6 main-menu">
7+
<div class="is-dark nes-container">
8+
<a href="/Randomize" class="row main-menu-row">
9+
<div class="col-3"><i class="nes-logo"></i></div>
10+
<div class="col-9">Begin a New Game!</div>
11+
</a>
12+
<a href="https://discord.gg/95gbpFd" class="row main-menu-row">
13+
<div class="col-3"><i class="nes-icon"><span class="discord-logo" /></i></div>
14+
<div class="col-9">Final Fantasy 1 Randomizer Discord</div>
15+
</a>
16+
<a href="https://discord.gg/s7CRejk" class="row main-menu-row">
17+
<div class="col-3"><i class="nes-icon"><span class="discord-logo" /></i></div>
18+
<div class="col-9">FFR Developer's Discord</div>
19+
</a>
20+
</div>
21+
</div>
22+
</div>

0 commit comments

Comments
 (0)