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

Fix #223 prevent resetting star range and sort order when selecting a language #225

Closed
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
6 changes: 3 additions & 3 deletions .xatarc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"databaseURL": "https://Usman-Sabuwala-s-workspace-u2kcvd.us-east-1.xata.sh/db/project-finder-hf",
"databaseURL": "https://Amandee-Manushika-s-workspace-d6c47s.us-east-1.xata.sh/db/amandee-db",
"codegen": {
"output": "xata.ts"
"output": "src/xata.ts"
}
}
}
5 changes: 3 additions & 2 deletions src/app/(public)/repos/[language]/_components/sorter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum SortTypes {
export function Sorter() {
const searchParams = useSearchParams();
const pathname = usePathname();
const urlSearchParam = new URLSearchParams(searchParams);

const navigationItems = [
{
Expand Down Expand Up @@ -129,7 +130,7 @@ export function Sorter() {
<ul tabIndex={0} className="menu menu-vertical">
{mainLanguages.sort(sortByName).map(language => (
<li key={language} onClick={handleClick}>
<Link href={`/repos/${language.toLowerCase()}`}>
<Link href={`/repos/${language.toLowerCase()}?${urlSearchParam.toString()}`}>
{language}
</Link>
</li>
Expand All @@ -148,7 +149,7 @@ export function Sorter() {
<div className="z-50 h-64 p-2 overflow-y-scroll shadow dropdown-content hidden group-hover:block -ml-16 bg-base-100 rounded-box w-60">
<ul tabIndex={0} className="menu menu-vertical">
{navigationItems.map((item, index) => {
const sp = item.onSelect(new URLSearchParams(searchParams));
const sp = item.onSelect(urlSearchParam);
if (item.name === SortTypes.BestMatch) {
sp.delete('o');
sp.delete('s');
Expand Down
130 changes: 65 additions & 65 deletions src/xata.ts
Original file line number Diff line number Diff line change
@@ -1,118 +1,118 @@
// Generated by Xata Codegen 0.26.7. Please do not edit.
import { buildClient } from '@xata.io/client';
// Generated by Xata Codegen 0.30.1. Please do not edit.
import { buildClient } from "@xata.io/client";
import type {
BaseClientOptions,
SchemaInference,
XataRecord
} from '@xata.io/client';
XataRecord,
} from "@xata.io/client";

const tables = [
{
name: 'reports',
name: "reports",
columns: [
{ name: 'repoId', type: 'int', unique: true },
{ name: 'repoAuthor', type: 'string' },
{ name: "repoId", type: "int", unique: true },
{ name: "repoAuthor", type: "string" },
{
name: 'message',
type: 'text',
name: "message",
type: "text",
notNull: true,
defaultValue: 'No Message'
defaultValue: "No Message",
},
{ name: 'user', type: 'link', link: { table: 'nextauth_users' } },
{ name: 'valid', type: 'bool', notNull: true, defaultValue: 'true' },
{ name: 'repoUrl', type: 'string', unique: true }
]
{ name: "user", type: "link", link: { table: "nextauth_users" } },
{ name: "valid", type: "bool", notNull: true, defaultValue: "true" },
{ name: "repoUrl", type: "string", unique: true },
],
},
{
name: 'nextauth_users',
name: "nextauth_users",
columns: [
{ name: 'email', type: 'email' },
{ name: 'emailVerified', type: 'datetime' },
{ name: 'name', type: 'string' },
{ name: 'image', type: 'string' }
{ name: "email", type: "email" },
{ name: "emailVerified", type: "datetime" },
{ name: "name", type: "string" },
{ name: "image", type: "string" },
],
revLinks: [
{ column: 'user', table: 'nextauth_accounts' },
{ column: 'user', table: 'nextauth_users_accounts' },
{ column: 'user', table: 'nextauth_users_sessions' },
{ column: 'user', table: 'nextauth_sessions' },
{ column: 'user', table: 'reports' }
]
{ column: "user", table: "nextauth_accounts" },
{ column: "user", table: "nextauth_users_accounts" },
{ column: "user", table: "nextauth_users_sessions" },
{ column: "user", table: "nextauth_sessions" },
{ column: "user", table: "reports" },
],
},
{
name: 'nextauth_accounts',
name: "nextauth_accounts",
columns: [
{ name: 'user', type: 'link', link: { table: 'nextauth_users' } },
{ name: 'type', type: 'string' },
{ name: 'provider', type: 'string' },
{ name: 'providerAccountId', type: 'string' },
{ name: 'refresh_token', type: 'string' },
{ name: 'access_token', type: 'string' },
{ name: 'expires_at', type: 'int' },
{ name: 'token_type', type: 'string' },
{ name: 'scope', type: 'string' },
{ name: 'id_token', type: 'text' },
{ name: 'session_state', type: 'string' }
{ name: "user", type: "link", link: { table: "nextauth_users" } },
{ name: "type", type: "string" },
{ name: "provider", type: "string" },
{ name: "providerAccountId", type: "string" },
{ name: "refresh_token", type: "string" },
{ name: "access_token", type: "string" },
{ name: "expires_at", type: "int" },
{ name: "token_type", type: "string" },
{ name: "scope", type: "string" },
{ name: "id_token", type: "text" },
{ name: "session_state", type: "string" },
],
revLinks: [{ column: 'account', table: 'nextauth_users_accounts' }]
revLinks: [{ column: "account", table: "nextauth_users_accounts" }],
},
{
name: 'nextauth_verificationTokens',
name: "nextauth_verificationTokens",
columns: [
{ name: 'identifier', type: 'string' },
{ name: 'token', type: 'string' },
{ name: 'expires', type: 'datetime' }
]
{ name: "identifier", type: "string" },
{ name: "token", type: "string" },
{ name: "expires", type: "datetime" },
],
},
{
name: 'nextauth_users_accounts',
name: "nextauth_users_accounts",
columns: [
{ name: 'user', type: 'link', link: { table: 'nextauth_users' } },
{ name: 'account', type: 'link', link: { table: 'nextauth_accounts' } }
]
{ name: "user", type: "link", link: { table: "nextauth_users" } },
{ name: "account", type: "link", link: { table: "nextauth_accounts" } },
],
},
{
name: 'nextauth_users_sessions',
name: "nextauth_users_sessions",
columns: [
{ name: 'user', type: 'link', link: { table: 'nextauth_users' } },
{ name: 'session', type: 'link', link: { table: 'nextauth_sessions' } }
]
{ name: "user", type: "link", link: { table: "nextauth_users" } },
{ name: "session", type: "link", link: { table: "nextauth_sessions" } },
],
},
{
name: 'nextauth_sessions',
name: "nextauth_sessions",
columns: [
{ name: 'sessionToken', type: 'string' },
{ name: 'expires', type: 'datetime' },
{ name: 'user', type: 'link', link: { table: 'nextauth_users' } }
{ name: "sessionToken", type: "string" },
{ name: "expires", type: "datetime" },
{ name: "user", type: "link", link: { table: "nextauth_users" } },
],
revLinks: [{ column: 'session', table: 'nextauth_users_sessions' }]
}
revLinks: [{ column: "session", table: "nextauth_users_sessions" }],
},
] as const;

export type SchemaTables = typeof tables;
export type InferredTypes = SchemaInference<SchemaTables>;

export type Reports = InferredTypes['reports'];
export type Reports = InferredTypes["reports"];
export type ReportsRecord = Reports & XataRecord;

export type NextauthUsers = InferredTypes['nextauth_users'];
export type NextauthUsers = InferredTypes["nextauth_users"];
export type NextauthUsersRecord = NextauthUsers & XataRecord;

export type NextauthAccounts = InferredTypes['nextauth_accounts'];
export type NextauthAccounts = InferredTypes["nextauth_accounts"];
export type NextauthAccountsRecord = NextauthAccounts & XataRecord;

export type NextauthVerificationTokens =
InferredTypes['nextauth_verificationTokens'];
InferredTypes["nextauth_verificationTokens"];
export type NextauthVerificationTokensRecord = NextauthVerificationTokens &
XataRecord;

export type NextauthUsersAccounts = InferredTypes['nextauth_users_accounts'];
export type NextauthUsersAccounts = InferredTypes["nextauth_users_accounts"];
export type NextauthUsersAccountsRecord = NextauthUsersAccounts & XataRecord;

export type NextauthUsersSessions = InferredTypes['nextauth_users_sessions'];
export type NextauthUsersSessions = InferredTypes["nextauth_users_sessions"];
export type NextauthUsersSessionsRecord = NextauthUsersSessions & XataRecord;

export type NextauthSessions = InferredTypes['nextauth_sessions'];
export type NextauthSessions = InferredTypes["nextauth_sessions"];
export type NextauthSessionsRecord = NextauthSessions & XataRecord;

export type DatabaseSchema = {
Expand All @@ -129,7 +129,7 @@ const DatabaseClient = buildClient();

const defaultOptions = {
databaseURL:
'https://Usman-Sabuwala-s-workspace-u2kcvd.us-east-1.xata.sh/db/project-finder-hf'
"https://Amandee-Manushika-s-workspace-d6c47s.us-east-1.xata.sh/db/amandee-db",
};

export class XataClient extends DatabaseClient<DatabaseSchema> {
Expand Down
Loading