Skip to content

Commit b4399b2

Browse files
danieldanieleckidanieldanielecki
committed
refactor: update project references from '@azure-fundamentals' to '@practice-tests-exams-platform' across components, hooks, and API routes; add Google Analytics component
1 parent 6a5a79a commit b4399b2

21 files changed

Lines changed: 83 additions & 61 deletions

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# 🧪 Practice Tests Exams Platform
2-
31
<div align="center">
42
<img src="public/logoWhite.svg" alt="Practice Tests Exams Platform" />
53
</div>

‎app/api/graphql/route.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {
22
CombinedQuestionsDataSource,
33
RepoQuestionsDataSource,
4-
} from "@azure-fundamentals/lib/graphql/questionsDataSource";
4+
} from "@practice-tests-exams-platform/lib/graphql/questionsDataSource";
55
import { ApolloServer, BaseContext } from "@apollo/server";
66
import { startServerAndCreateNextHandler } from "@as-integrations/next";
7-
import typeDefs from "@azure-fundamentals/lib/graphql/schemas";
8-
import resolvers from "@azure-fundamentals/lib/graphql/resolvers";
9-
import { fetchQuestions } from "@azure-fundamentals/lib/graphql/repoQuestions";
7+
import typeDefs from "@practice-tests-exams-platform/lib/graphql/schemas";
8+
import resolvers from "@practice-tests-exams-platform/lib/graphql/resolvers";
9+
import { fetchQuestions } from "@practice-tests-exams-platform/lib/graphql/repoQuestions";
1010

1111
interface ContextValue {
1212
dataSources: {

‎app/exam/page.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { useEffect, useState } from "react";
44
import type { NextPage } from "next";
55
import { gql } from "@apollo/client";
66
import { useQuery } from "@apollo/client/react";
7-
import useTimer from "@azure-fundamentals/hooks/useTimer";
8-
import { Button } from "@azure-fundamentals/components/Button";
9-
import QuizExamForm from "@azure-fundamentals/components/QuizExamFormUF";
10-
import { Question } from "@azure-fundamentals/components/types";
11-
import ExamResult from "@azure-fundamentals/components/ExamResult";
12-
import LoadingIndicator from "@azure-fundamentals/components/LoadingIndicator";
13-
import { useTrialAccess } from "@azure-fundamentals/hooks/useTrialAccess";
7+
import useTimer from "@practice-tests-exams-platform/hooks/useTimer";
8+
import { Button } from "@practice-tests-exams-platform/components/Button";
9+
import QuizExamForm from "@practice-tests-exams-platform/components/QuizExamFormUF";
10+
import { Question } from "@practice-tests-exams-platform/components/types";
11+
import ExamResult from "@practice-tests-exams-platform/components/ExamResult";
12+
import LoadingIndicator from "@practice-tests-exams-platform/components/LoadingIndicator";
13+
import { useTrialAccess } from "@practice-tests-exams-platform/hooks/useTrialAccess";
1414

1515
const questionsQuery = gql`
1616
query RandomQuestions($range: Int!, $link: String) {

‎app/layout.tsx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { type ReactNode } from "react";
22
import { type Metadata, type Viewport } from "next";
33
import { Philosopher, Lora } from "next/font/google";
4-
import Header from "@azure-fundamentals/components/Header";
5-
import Footer from "@azure-fundamentals/components/Footer";
6-
import ApolloProvider from "@azure-fundamentals/components/ApolloProvider";
7-
import Cookie from "@azure-fundamentals/components/Cookie";
8-
import { AuthProvider } from "@azure-fundamentals/contexts/AuthContext";
9-
import { ThemeProvider } from "@azure-fundamentals/contexts/ThemeContext";
10-
import { TrialWarning } from "@azure-fundamentals/components/TrialWarning";
4+
import Header from "@practice-tests-exams-platform/components/Header";
5+
import Footer from "@practice-tests-exams-platform/components/Footer";
6+
import ApolloProvider from "@practice-tests-exams-platform/components/ApolloProvider";
7+
import Cookie from "@practice-tests-exams-platform/components/Cookie";
8+
import GoogleAnalytics from "@practice-tests-exams-platform/components/GoogleAnalytics";
9+
import { AuthProvider } from "@practice-tests-exams-platform/contexts/AuthContext";
10+
import { ThemeProvider } from "@practice-tests-exams-platform/contexts/ThemeContext";
11+
import { TrialWarning } from "@practice-tests-exams-platform/components/TrialWarning";
1112
import { Analytics } from "@vercel/analytics/next";
1213
import { SpeedInsights } from "@vercel/speed-insights/next";
1314
import "styles/globals.css";
@@ -133,6 +134,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
133134
{children}
134135
<Footer />
135136
<Cookie />
137+
<GoogleAnalytics />
136138
<TrialWarning />
137139
</main>
138140
</AuthProvider>

‎app/modes/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { useState, useEffect } from "react";
44
import type { NextPage } from "next";
5-
import ExamLink from "@azure-fundamentals/components/ExamLink";
5+
import ExamLink from "@practice-tests-exams-platform/components/ExamLink";
66

77
const Modes: NextPage = () => {
88
const [searchParams, setSearchParams] = useState<URLSearchParams | null>(

‎app/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import { useState } from "react";
44
import type { NextPage } from "next";
5-
import NameLink from "@azure-fundamentals/components/NameLink";
6-
import exams from "@azure-fundamentals/lib/exams.json";
7-
import useDebounce from "@azure-fundamentals/hooks/useDebounce";
5+
import NameLink from "@practice-tests-exams-platform/components/NameLink";
6+
import exams from "@practice-tests-exams-platform/lib/exams.json";
7+
import useDebounce from "@practice-tests-exams-platform/hooks/useDebounce";
88

99
const Home: NextPage = () => {
1010
const [searchTerm, setSearchTerm] = useState("");

‎app/practice/page.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { useState, useEffect, useCallback } from "react";
44
import { gql } from "@apollo/client";
55
import { useQuery } from "@apollo/client/react";
66
import type { NextPage } from "next";
7-
import QuizForm from "@azure-fundamentals/components/QuizForm";
8-
import { useTrialAccess } from "@azure-fundamentals/hooks/useTrialAccess";
9-
import LoadingIndicator from "@azure-fundamentals/components/LoadingIndicator";
7+
import QuizForm from "@practice-tests-exams-platform/components/QuizForm";
8+
import { useTrialAccess } from "@practice-tests-exams-platform/hooks/useTrialAccess";
9+
import LoadingIndicator from "@practice-tests-exams-platform/components/LoadingIndicator";
1010

1111
const questionQuery = gql`
1212
query QuestionById($id: ID!, $link: String) {
@@ -33,7 +33,9 @@ const questionsQuery = gql`
3333
`;
3434

3535
type QuestionByIdData = {
36-
questionById: import("@azure-fundamentals/components/types").Question | null;
36+
questionById:
37+
| import("@practice-tests-exams-platform/components/types").Question
38+
| null;
3739
};
3840
type QuestionsCountData = {
3941
questions: { count: number };

‎components/ApolloProvider.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client";
22

3-
import client from "@azure-fundamentals/lib/graphql/apollo-client";
3+
import client from "@practice-tests-exams-platform/lib/graphql/apollo-client";
44
import { ReactNode } from "react";
55
import { ApolloProvider as NextApolloProvider } from "@apollo/client/react";
66

‎components/Cookie.tsx‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
import { useEffect, type FC } from "react";
33
import "vanilla-cookieconsent/dist/cookieconsent.css";
44
import * as CookieConsent from "vanilla-cookieconsent";
5-
import getConfig from "@azure-fundamentals/utils/CookieConfig";
6-
import addCookieConsentListeners from "@azure-fundamentals/utils/CookieListeners";
5+
import getConfig from "@practice-tests-exams-platform/utils/CookieConfig";
6+
import addCookieConsentListeners from "@practice-tests-exams-platform/utils/CookieListeners";
77
import { useTheme } from "../contexts/ThemeContext";
8-
import Script from "next/script";
98

109
const Cookie: FC = () => {
11-
const GA_TRACKING_ID = process.env.NEXT_PUBLIC_GA_TRACKING_ID;
1210
const { theme } = useTheme();
1311

1412
useEffect(() => {
@@ -42,20 +40,6 @@ const Cookie: FC = () => {
4240
<path d="M8 0a7.96 7.96 0 0 0-4.075 1.114q-.245.102-.437.28A8 8 0 1 0 8 0m3.25 14.201a1.5 1.5 0 0 0-2.13.71A7 7 0 0 1 8 15a6.97 6.97 0 0 1-3.845-1.15 1.5 1.5 0 1 0-2.005-2.005A6.97 6.97 0 0 1 1 8c0-1.953.8-3.719 2.09-4.989a1.5 1.5 0 1 0 2.469-1.574A7 7 0 0 1 8 1c1.42 0 2.742.423 3.845 1.15a1.5 1.5 0 1 0 2.005 2.005A6.97 6.97 0 0 1 15 8c0 .596-.074 1.174-.214 1.727a1.5 1.5 0 1 0-1.025 2.25 7 7 0 0 1-2.51 2.224Z" />
4341
</svg>
4442
</button>
45-
<Script
46-
src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`}
47-
/>
48-
<Script id="google-analytics">
49-
{`
50-
window.dataLayer = window.dataLayer || [];
51-
function gtag(){dataLayer.push(arguments);}
52-
gtag('js', new Date());
53-
gtag('consent', 'default', {'analytics_storage':'denied'})
54-
gtag('config', '${GA_TRACKING_ID}', {
55-
page_path: window.location.pathname,
56-
});
57-
`}
58-
</Script>
5943
</>
6044
);
6145
};

‎components/ExamQuizForm.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use client";
22

3-
import SelectionInput from "@azure-fundamentals/components/SelectionInput";
4-
import { Button } from "@azure-fundamentals/components/Button";
3+
import SelectionInput from "@practice-tests-exams-platform/components/SelectionInput";
4+
import { Button } from "@practice-tests-exams-platform/components/Button";
55
import { FC } from "react";
66
import { useForm } from "react-hook-form";
7-
import { Question } from "@azure-fundamentals/components/types";
7+
import { Question } from "@practice-tests-exams-platform/components/types";
88
import LoadingIndicator from "./LoadingIndicator";
99
import MarkdownRenderer from "./MarkdownRenderer";
1010

0 commit comments

Comments
 (0)