Merge pull request #322 from FiendsOfTheElements/dev

3.0

.circleci/config.yml

@@ -14,131 +14,53 @@ jobs:
       - run:
           name: publish
           command: |
-            cd FF1RandomizerOnline
+            set -ex
+            cd FF1Blazorizer
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               dotnet publish -c Release
-              git rev-parse HEAD > bin/Release/netcoreapp2.1/publish/version.txt
+              git rev-parse HEAD > bin/Release/netstandard2.0/publish/FF1Blazorizer/dist/version.txt
             else
               dotnet publish -c Debug
-              git rev-parse HEAD > bin/Debug/netcoreapp2.1/publish/version.txt
+              git rev-parse HEAD > bin/Debug/netstandard2.0/publish/FF1Blazorizer/dist/version.txt
             fi
       - persist_to_workspace:
           root: ~/ff1randomizer
-          paths: FF1RandomizerOnline
+          paths:
+            - FF1Blazorizer
 
-  dockerize_production:
+  deploy:
     <<: *defaults
     steps:
-      - setup_remote_docker
-      - attach_workspace:
-          at: ~/ff1randomizer
-      - run:
-          name: docker
-          command: |
-            cd FF1RandomizerOnline && \
-            docker login -u $DOCKER_USER -p $DOCKER_PASS && \
-            docker build -t entroper/finalfantasyrandomizer:latest -f Dockerfile . && \
-            docker push entroper/finalfantasyrandomizer:latest
-
-  dockerize_beta:
-    <<: *defaults
-    steps:
-      - setup_remote_docker
-      - attach_workspace:
-          at: ~/ff1randomizer
-      - run:
-          name: docker
-          command: |
-            cd FF1RandomizerOnline && \
-            docker login -u $DOCKER_USER -p $DOCKER_PASS && \
-            docker build -t entroper/finalfantasyrandomizer:beta -f Dockerfile.debug . && \
-            docker push entroper/finalfantasyrandomizer:beta
-
-  dockerize_alpha:
-    <<: *defaults
-    steps:
-      - setup_remote_docker
+      - checkout
       - attach_workspace:
           at: ~/ff1randomizer
-      - run:
-          name: docker
-          command: |
-            cd FF1RandomizerOnline && \
-            docker login -u $DOCKER_USER -p $DOCKER_PASS && \
-            docker build -t entroper/finalfantasyrandomizer:alpha -f Dockerfile.debug . && \
-            docker push entroper/finalfantasyrandomizer:alpha
-
-  deploy_production:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: deploy
-          command: |
-            mkdir -p ~/.ssh && \
-            cp .ssh/known_hosts ~/.ssh/known_hosts && \
-            ssh circle@finalfantasyrandomizer.com "./deployff1r.sh master"
-
-  deploy_beta:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: deploy
-          command: |
-            mkdir -p ~/.ssh && \
-            cp .ssh/known_hosts ~/.ssh/known_hosts && \
-            ssh circle@finalfantasyrandomizer.com "./deployff1r.sh dev"
-
-  deploy_alpha:
-    <<: *defaults
-    steps:
-      - checkout
       - run:
           name: deploy
           command: |
-            mkdir -p ~/.ssh && \
-            cp .ssh/known_hosts ~/.ssh/known_hosts && \
-            ssh circle@finalfantasyrandomizer.com "./deployff1r.sh alpha"
+            set -ex
+            mkdir -p ~/.ssh
+            cp .ssh/known_hosts ~/.ssh/known_hosts
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              pushd FF1Blazorizer/bin/Release/netstandard2.0/publish/FF1Blazorizer/dist
+            else
+              pushd FF1Blazorizer/bin/Debug/netstandard2.0/publish/FF1Blazorizer/dist
+            fi
+            tar cvzf ../../../../../../../FF1Blazorizer.tar.gz .
+            popd
+            scp FF1Blazorizer.tar.gz circle@finalfantasyrandomizer.com:FF1Blazorizer.tar.gz
+            ssh circle@finalfantasyrandomizer.com "./deployff1rblazor.sh $CIRCLE_BRANCH"
 
 workflows:
   version: 2
   main:
     jobs:
       - build
-      - dockerize_production:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
-      - dockerize_beta:
+      - deploy:
           requires:
             - build
           filters:
             branches:
-              only: dev
-      - dockerize_alpha:
-          requires:
-            - build
-          filters:
-            branches:
-              only: alpha
-      - deploy_production:
-          requires:
-            - dockerize_production
-          filters:
-            branches:
-              only: master
-      - deploy_beta:
-          requires:
-            - dockerize_beta
-          filters:
-            branches:
-              only: dev
-      - deploy_alpha:
-          requires:
-            - dockerize_alpha
-          filters:
-            branches:
-              only: alpha
+              only:
+                - master
+                - dev
+                - alpha

.editorconfig

@@ -9,9 +9,15 @@ indent_size = 4
 indent_style = tab
 end_of_line = crlf
 
-[*.{csproj,yml,yaml}]
+[*.{csproj}]
 indent_size = 2
 indent_style = space
+end_of_line = crlf
+
+[*.{yml,yaml}]
+indent_size = 2
+indent_style = space
+end_of_line = lf
 
 [*.{js,json}]
 indent_size = 4

.gitignore

@@ -246,3 +246,6 @@ _Pvt_Extensions
 # Archives
 *.zip
 *.tar.gz
+
+# IDEA files (Rider IDE, Pycharm, etc)
+.idea/

FF1Blazorizer/FF1Blazorizer.csproj

@@ -7,8 +7,15 @@
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
   <ItemGroup>
+    <PackageReference Include="Blazor.Extensions.Storage" Version="0.1.7" />
     <PackageReference Include="BlazorStrap" Version="0.6.1" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" PrivateAssets="all" />
     <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0" />
@@ -31,6 +38,9 @@
     <Content Update="wwwroot\presets\full-npc.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="wwwroot\presets\chaos-rush.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="wwwroot\presets\improved-vanilla.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

FF1Blazorizer/Pages/Index.cshtml

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