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.

Sign up for GitHub

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

changed deploy.staging to deploy off different branch #78

Closed
wants to merge 3 commits into from
Closed

changed deploy.staging to deploy off different branch #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d601cb
changed deploy.staging to deploy off different branch
AntGa Aug 11, 2024
6f781ba
added notion token and members id
AntGa Aug 11, 2024
38e3385
changed text to see what's happening
AntGa Aug 11, 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
8 changes: 7 additions & 1 deletion .github/workflows/deploy.staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@ name: Fly Deploy Staging
on:
push:
branches:
- main
- ORAKEI-Anton-Test-Deploy

jobs:
deploy-web:
name: Deploy Web
runs-on: ubuntu-latest
environment: Notion
steps:
- uses: actions/checkout@v3
- uses: superfly/flyctl-actions/setup-flyctl@master
- run: flyctl deploy --remote-only --config fly.staging.toml
env:
FLY_API_TOKEN: ${{ secrets.FLY_STAGING_API_TOKEN }}
NOTION_PAGE_ID: ${{ secrets.NOTION_PAGE_ID }}
NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
NOTION_MEMBERS_ID: ${{ secrets.NOTION_MEMBERS_ID }}
ANTON: ${{ secrets.ANTON }}

2 changes: 1 addition & 1 deletion src/components/index page/IndexHero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const IndexHero = () => {
<p className={styles.heroSubheading}>Youth of Ōrākei</p>
<h1 className={styles.heroHeading}>Empowering and engaging Ōrākei youth to promote their wellbeing</h1>
<p className={styles.heroDesc}>We’re the Youth of Ōrākei, a group of 26 young leaders (aged 12-24) from the
Ōrākei Local Board area who are determined to make a positive impact in our community.</p>
asdsadsadŌrākei Local Board area who are determined to make a positive impact in our community.</p>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import React from "react";
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width" />
<meta name="generator" content={Astro.generator} />
<title>Youth of Ōrākei | Home</title>
<title>Anton is failing at this | Home</title>
</head>

<Layout>
Expand Down
7 changes: 4 additions & 3 deletions src/scripts/getMembers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ type MemberData = {

export async function getMembers(): Promise<MemberData[]> {

if (!import.meta.env.NOTION_TOKEN || !import.meta.env.NOTION_MEMBERS_ID)
console.log(process.env.ANTON)
if (!process.env.NOTION_TOKEN || !process.env.NOTION_MEMBERS_ID)
throw new Error("Missing secret(s)");

const notion = new Client({ auth: import.meta.env.NOTION_TOKEN });
const notion = new Client({ auth: process.env.NOTION_TOKEN });

const query = await notion.databases.query({
database_id: import.meta.env.NOTION_MEMBERS_ID,
database_id: process.env.NOTION_MEMBERS_ID,
sorts: [{
property: 'Name',
direction: 'ascending'
Expand Down