Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📡🤖 ↝ [SSG-29 SSG-19 SSC-17 SSG-2]: Chapter 2/3 integration scene #159

Merged
merged 17 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bdb5f52
🎏🦗 ↝ [SSC-21 SSC-16]: Fixing plankton portal & updating ui for planet…
Gizmotronn Oct 7, 2024
c1c2c81
🥃🛕 ↝ [SSG-32 SSG-33 SSG-34]: UI bugs fixed, attempting to remove grey…
Gizmotronn Oct 7, 2024
1c484ff
🐪🤹🏻 ↝ [SSM-17 SSC-16 SSG-32]: Updated Classification Cards and some m…
Gizmotronn Oct 7, 2024
55ec8c8
🦚🥈 ↝ [SSM-17]: Styling tests
Gizmotronn Oct 7, 2024
f432c4a
🥉🦣 ↝ [SSG-32 SSG-31 SSC-17]: Fixing some bugs & improved mining scene…
Gizmotronn Oct 8, 2024
0c8e937
👗🪼 ↝ [SSC-24 SSM-17]: Classifications now have a more rich output and…
Gizmotronn Oct 8, 2024
10e80f6
🏂🐦 ↝ [SSM-17 SSM-19 SSC-16]: Travel mechanism updated with new planet…
Gizmotronn Oct 9, 2024
b12f032
🎧🌎 ↝ [SSM-20]: Reorganising files for content feed
Gizmotronn Oct 9, 2024
8408b60
🎼🥑 ↝ [SSP-24 SSM-20]: New planet/anomaly setting backgrounds
Gizmotronn Oct 9, 2024
1403cef
🍁🌈 ↝ [SSP-22 SSM-20]: New user pathway ideas & feed in test page
Gizmotronn Oct 10, 2024
5abc5e7
🏟️🏂 ↝ [SSM-20]: Classification feed integrated
Gizmotronn Oct 10, 2024
4e8950b
🤖🎂 ↝ [SSC-13 SSM-15 SSC-26]: Adding new transit methods/input form an…
Gizmotronn Oct 10, 2024
0f30b89
🐦🛣️ ↝ [SSC-26 SSG-32 SSC-28 SSG-34]: Some bug reporting and working c…
Gizmotronn Oct 10, 2024
e99beb0
🌺🏄🏻‍♂️ ↝ [SSG-32 SSG-34 SSC-26]: Making some UI adjustments for exopl…
Gizmotronn Oct 11, 2024
e51d334
🌭🪵 ↝ [SSG-32 SSG-34 SSC-13 SSC-26 SSC-28]: Tests working for exoplane…
Gizmotronn Oct 12, 2024
39b1a3e
🎒🫛 ↝ [SSP-22 SSG-31]: Mining component now links in with the rest of …
Gizmotronn Oct 12, 2024
07eebd8
🦔📡 ↝ [SSG-29 SSG-19 SSC-17 SSP-22 SSP-23]: Mission pathway is include…
Gizmotronn Oct 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
25 changes: 25 additions & 0 deletions .github/deployments/docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Docker Build

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2
with:
submodules: true

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build Docker images
run: docker-compose -f compose.yml build
94 changes: 50 additions & 44 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,67 +1,73 @@
name: "CodeQL"
name: Build and CodeQL Analysis

on:
push:
branches:
- '**'
- '**'
pull_request:
branches:
- '**'
schedule:
- cron: '0 21 * * 0'

jobs:
analyze:
name: Analyze
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '20'

- name: Install dependencies
run: yarn install
env:
NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}

- name: Build the app
run: yarn build
env:
NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}

- name: Cache node modules
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

codeql:
name: CodeQL Analysis
runs-on: ubuntu-latest
needs: build # Ensures the build job runs first

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}

#- run: |
# make bootstrap
# make release
- name: Autobuild
uses: github/codeql-action/autobuild@v1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ docker exec -it starsailors_db psql -U postgres
\l
docker compose build flaskapp
docker compose up -d flaskapp
```
```

<!--
Add "@ducanh2912/next-pwa": "^10.2.9", back
-->
2 changes: 1 addition & 1 deletion app/api/gameplay/missions/archive/route.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
import { MineralDepositsNoAction } from "@/components/(structures)/Mining/AvailableDeposits";
import { MineralDepositsNoAction } from "@/components/Structures/Mining/Archive/AvailableDeposits";

interface UserMissionInstance {
id: number;
Expand Down
2 changes: 1 addition & 1 deletion app/api/gameplay/missions/planets/initialisation/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const planetInitialisationMissions: Mission[] = [
id: 100001,
name: "Initialise Mercury",
anomaly: 10,
},
},
{
id: 200001,
name: "Initialise Venus",
Expand Down
32 changes: 31 additions & 1 deletion app/api/gameplay/missions/route.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
import { MineralDepositsNoAction } from "@/components/(structures)/Mining/AvailableDeposits";
import { MineralDepositsNoAction } from "@/components/Structures/Mining/Archive/AvailableDeposits";

export interface Mission {
id: number;
Expand Down Expand Up @@ -261,6 +261,36 @@ const missions: Mission[] = [
id: 2000000122,
name: 'Make your first Plankton Portal classification',
},
{
id: 200000013,
name: "Collect some fuel"
},
{
id: 200000014,
name: "Add fuel to your launchpad & rocket"
},
{
id: 200000015,
name: "Build a telescope",
},
{
id: 200000016,
name: "Planet hunters module",
},
{
id: 200000017,
name: "Build a LIDAR structure",
},

// Chapter 2/3 bridge - finding new (exo-)planet
{
id: 30000001,
name: "Classify and discover a new planet", // Requires classification and period/t0
},
{
id: 300000012,
name: "Visit your new planet",
},
];

export async function GET(req: NextRequest) {
Expand Down
50 changes: 47 additions & 3 deletions app/auth/LoginModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { MicroscopeIcon, CodeIcon, FilesIcon } from "lucide-react";
import { Flexbox } from 'react-layout-kit';
import { createStyles } from 'antd-style';
import { rgba } from 'polished';
import { Card, CardContent } from "@/components/ui/card";
import { Separator } from "@/components/ui/separator";

interface AuthPageProps {
children: ReactNode;
Expand Down Expand Up @@ -57,6 +59,8 @@ const Navbar = () => {
};

function SupabaseAuthWrapper({ children }: { children: ReactNode }) {
const supabase = useSupabaseClient();

const { styles } = useStyles();

return (
Expand Down Expand Up @@ -88,12 +92,52 @@ function SupabaseAuthWrapper({ children }: { children: ReactNode }) {
>
<strong className="font-extrabold text-transparent text-8xl bg-clip-text bg-gradient-to-r from-green-200 to-amber-300" style={{ fontSize: 'min(56px, 8vw)' }}>Star Sailors</strong>
</Flexbox>
<p className="max-w-[600px] text-muted-foreground md:text-xl">Explore the cosmos & catalogue discoveries in different scientific disciplines</p>
<p className="max-w-[600px] text-muted-foreground text-blue-800 md:text-xl">Explore the cosmos & catalogue discoveries in different scientific disciplines</p>
<div className="max-w-md w-full mx-auto py-5">
<div className="bg-gray-100 p-8 rounded-lg shadow-lg">
{children}
<Card>
<CardContent>
<div className="relative my-4">
<div className="absolute inset-0 flex items-center">
<Separator className="w-full" />
</div>
<div className="relative flex justify-center text-xs uppercase">
<span className="bg-background px-2 text-muted-foreground">Or continue with</span>
</div>
</div>
<Auth
supabaseClient={supabase}
providers={["google"]}
socialLayout="horizontal"
theme="light"
/>

<div className="flex flex-col gap-3 mt-6">
<h3 className="text-lg font-semibold">Connect</h3>
<Link
href="https://threads.net/droidology"
className="flex items-center gap-2 p-2 rounded-md bg-gradient-to-r from-purple-500 to-pink-500 text-white hover:from-purple-600 hover:to-pink-600 transition-colors"
>
<MicroscopeIcon className="h-5 w-5" />
Threads
</Link>
<Link
href="https://github.com/signal-k"
className="flex items-center gap-2 p-2 rounded-md bg-gradient-to-r from-gray-800 to-gray-900 text-white hover:from-gray-900 hover:to-black transition-colors"
>
<CodeIcon className="h-5 w-5" />
Github
</Link>
<Link
href="https://github.com/signal-k/manuscript"
className="flex items-center gap-2 p-2 rounded-md bg-gradient-to-r from-blue-500 to-cyan-500 text-white hover:from-blue-600 hover:to-cyan-600 transition-colors"
>
<FilesIcon className="h-5 w-5" />
Documentation
</Link>
</div>
</CardContent>
</Card>
</div>
</div>
</div>
</div>
Expand Down
Loading
Loading