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

Changed styles #89

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion back_end/api/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export async function updateEvent(eventName, key, value, test = "Events") {
Sponsor: "string",
};

// rome-ignore lint/suspicious/useValidTypeof: js be like:
// biome-ignore lint/suspicious/useValidTypeof: js be like:
if (typeof value !== valueTypes[key]) {
console.error(
`Invalid value type provided for key '${key}'. Expected type: '${valueTypes[key]}'.`,
Expand Down
64 changes: 32 additions & 32 deletions back_end/api/github.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
import { supabaseClient } from '../utils/db'
import { supabaseClient } from "../utils/db";

const sb = supabaseClient()
const sb = supabaseClient();

export async function getMembers () {
const { data, error } = await sb.from('ghmembers').select('*')
if (error) throw error
return data
export async function getMembers() {
const { data, error } = await sb.from("ghmembers").select("*");
if (error) throw error;
return data;
}

export async function getTeams () {
const { data, error } = await sb.from('ghteams').select('*')
if (error) throw error
return data
export async function getTeams() {
const { data, error } = await sb.from("ghteams").select("*");
if (error) throw error;
return data;
}

export async function getMembersForTeams () {
const teams = await getTeams()
const members = await getMembers()
export async function getMembersForTeams() {
const teams = await getTeams();
const members = await getMembers();

const memberMap = {}
for (const member of members) {
memberMap[member.id] = member
}
const memberMap = {};
for (const member of members) {
memberMap[member.id] = member;
}

const teamMap = {}
for (const team of teams) {
teamMap[team.id] = team
}
const teamMap = {};
for (const team of teams) {
teamMap[team.id] = team;
}

const { data, error } = await sb.from('ghteammembers').select('*')
const { data, error } = await sb.from("ghteammembers").select("*");

if (error) throw error
if (!data) return {}
if (error) throw error;
if (!data) return {};

const membersForTeams = {}
const membersForTeams = {};

for (const team of teams) membersForTeams[teamMap[team.id].name] = []
for (const team of teams) membersForTeams[teamMap[team.id].name] = [];

for (const membership of data) {
const member = memberMap[membership.member_id]
const team = teamMap[membership.team_id]
for (const membership of data) {
const member = memberMap[membership.member_id];
const team = teamMap[membership.team_id];

if (member && team) membersForTeams[team.name].push(member)
}
if (member && team) membersForTeams[team.name].push(member);
}

return membersForTeams
return membersForTeams;
}
2 changes: 1 addition & 1 deletion back_end/api/leads.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export async function updateLead(leadName, key, value, test = "Club_Leads") {
Team: "string",
};

// rome-ignore lint/suspicious/useValidTypeof: dont make me explain myself
// biome-ignore lint/suspicious/useValidTypeof: dont make me explain myself
if (typeof value !== valueTypes[key]) {
console.error(
`Invalid value type provided for key '${key}'. Expected type: '${valueTypes[key]}'.`,
Expand Down
2 changes: 1 addition & 1 deletion back_end/api/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export async function updateProject(
Start_Date: "number",
};

// rome-ignore lint/suspicious/useValidTypeof: gotta
// biome-ignore lint/suspicious/useValidTypeof: gotta
if (typeof value !== valueTypes[key]) {
console.error(
`Invalid value type provided for key '${key}'. Expected type: '${valueTypes[key]}'.`,
Expand Down
42 changes: 21 additions & 21 deletions back_end/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "back_end",
"version": "1.0.0",
"description": "Back End dependencies",
"main": "index.js",
"type": "module",
"directories": {
"doc": "docs",
"test": "test"
},
"scripts": {
"test": "mocha test/*.js --exit"
},
"author": "Ben,Frank,Wu",
"license": "ISC",
"dependencies": {
"@supabase/supabase-js": "^2.39.7",
"chai": "^4.3.6",
"chart.js": "^4.4.1",
"firebase": "9.10.0",
"mocha": "^10.0.0"
}
"name": "back_end",
"version": "1.0.0",
"description": "Back End dependencies",
"main": "index.js",
"type": "module",
"directories": {
"doc": "docs",
"test": "test"
},
"scripts": {
"test": "mocha test/*.js --exit"
},
"author": "Ben,Frank,Wu",
"license": "ISC",
"dependencies": {
"@supabase/supabase-js": "^2.39.7",
"chai": "^4.3.6",
"chart.js": "^4.4.1",
"firebase": "9.10.0",
"mocha": "^10.0.0"
}
}
9 changes: 4 additions & 5 deletions back_end/utils/db.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { createClient } from '@supabase/supabase-js'

const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL
const supabaseKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY
import { createClient } from "@supabase/supabase-js";

const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
const supabaseKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;

const client = createClient(supabaseUrl, supabaseKey);

export function supabaseClient() {
return client;
}
}
2 changes: 1 addition & 1 deletion back_end/utils/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export async function getData(queryString) {
// Error object for the API
export const errObj = {
error: "Error occured, please check console!",
};
};
Loading
Loading