Skip to content

Commit

Permalink
Create React App is no longer supported, switched to Vite plus some o…
Browse files Browse the repository at this point in the history
…ther improvements

* Upgraded video.js to its latest version

* The videojs-vtt-thumbnails plugin is now sourced in-house since it's no longer actively maintained and adds an enormous signature

* Improved the navbar layout on mobile devices

* Added license headers to the new files

* Added an analyze script to package.json

* Make sure console.log calls don't appear in a production build

* Added resolution to the MediaContainer card component

* Fixed the expanded video player size problem bust still not working well in development due to StrictMode

* Fixed the Toast layout and a StrictMode bug after the upgrade to react-toastify 11

* When debugging, -d shouldn't be passed to the docker compose up

* Ditched CRA in favor of Vite

* Renamed the .js files using JSX to .jsx in order to ensure vite processes them
  • Loading branch information
omanikhi committed Dec 27, 2024
1 parent 92c4689 commit 21670d7
Show file tree
Hide file tree
Showing 55 changed files with 9,549 additions and 18,578 deletions.
16 changes: 16 additions & 0 deletions .vscode/templates/jsx.lict
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Copyright © %(CopyrightYear) Travelonium AB

This file is part of Arcadeia.

Arcadeia is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

Arcadeia is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
16 changes: 16 additions & 0 deletions .vscode/templates/ts.lict
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Copyright © %(CopyrightYear) Travelonium AB

This file is part of Arcadeia.

Arcadeia is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

Arcadeia is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
16 changes: 16 additions & 0 deletions .vscode/templates/tsx.lict
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Copyright © %(CopyrightYear) Travelonium AB

This file is part of Arcadeia.

Arcadeia is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

Arcadeia is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
4 changes: 2 additions & 2 deletions Arcadeia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<IsPackable>false</IsPackable>
<SpaRoot>UI\</SpaRoot>
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
<SpaProxyServerUrl>https://localhost:44438</SpaProxyServerUrl>
<SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand>
<SpaProxyServerUrl>http://localhost:5173</SpaProxyServerUrl>
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
20 changes: 20 additions & 0 deletions Site/.vitepress/config.mts
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
/*
* Copyright © 2024 Travelonium AB
*
* This file is part of Arcadeia.
*
* Arcadeia is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Arcadeia is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
*
*/

import fs from 'fs';
import path from 'path';
import simpleGit from 'simple-git';
Expand Down
20 changes: 20 additions & 0 deletions Site/.vitepress/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
/*
* Copyright © 2024 Travelonium AB
*
* This file is part of Arcadeia.
*
* Arcadeia is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Arcadeia is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
*
*/

// https://vitepress.dev/guide/custom-theme

import { h } from 'vue'
Expand Down
20 changes: 20 additions & 0 deletions Site/.vitepress/theme/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
/*
* Copyright © 2024 Travelonium AB
*
* This file is part of Arcadeia.
*
* Arcadeia is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Arcadeia is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
*
*/

/**
* Customize default theme styling by overriding CSS variables:
* https://github.com/vuejs/vitepress/blob/main/src/client/theme-default/styles/vars.css
Expand Down
16 changes: 7 additions & 9 deletions Startup.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
/*
/*
* Copyright © 2024 Travelonium AB
*
*
* This file is part of Arcadeia.
*
*
* Arcadeia is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* Arcadeia is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
*
* You should have received a copy of the GNU Affero General Public License
* along with Arcadeia. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

using Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer;
using Microsoft.AspNetCore.HttpOverrides;
using Arcadeia.Configuration;
using Arcadeia.Services;
Expand Down Expand Up @@ -181,7 +180,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
if (env.IsDevelopment())
{
app.UseHttpsRedirection();
app.UseDeveloperExceptionPage();
}
else
Expand Down Expand Up @@ -224,7 +222,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

if (env.IsDevelopment())
{
spa.UseReactDevelopmentServer(npmScript: "start");
spa.UseProxyToSpaDevelopmentServer("http://localhost:5173");
}
});
}
Expand Down
6 changes: 0 additions & 6 deletions UI/.babelrc

This file was deleted.

1 change: 0 additions & 1 deletion UI/.env

This file was deleted.

3 changes: 0 additions & 3 deletions UI/.env.development

This file was deleted.

39 changes: 21 additions & 18 deletions UI/.gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
53 changes: 0 additions & 53 deletions UI/aspnetcore-https.js

This file was deleted.

75 changes: 0 additions & 75 deletions UI/aspnetcore-react.js

This file was deleted.

Loading

0 comments on commit 21670d7

Please sign in to comment.