Skip to content

Commit e13e84e

Browse files
resolve merge conflicts
2 parents 1d8610a + 76bcb7f commit e13e84e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6839
-501
lines changed

.github/FUNDING.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: Ditectrev
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: Bug report
33
about: Create a report to help us improve
44
title: "[BUG] Bug title"
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Describe the bug**
1110
A clear and concise description of what the bug is.
1211

1312
**To Reproduce**
1413
Steps to reproduce the behavior:
15-
1. Go to '...'
16-
2. Click on '....'
17-
3. Scroll down to '....'
14+
15+
1. Go to `...`
16+
2. Click on `....`
17+
3. Scroll down to `....`
1818
4. See error
1919

2020
**Expected behavior**
@@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
27+
28+
- OS: `[e.g. iOS]`
29+
- Browser: `[e.g. chrome, safari]`
30+
- Version: `[e.g. 22]`
3031

3132
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
33+
34+
- Device: `[e.g. iPhone6]`
35+
- OS: `[e.g. iOS8.1]`
36+
- Browser: `[e.g. stock browser, safari]`
37+
- Version: `[e.g. 22]`
3638

3739
**Additional context**
3840
Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Please choose the PR Type and give as many details as possible about your PR.
55

66
Fixes #0000 <!-- link to issue if one exists -->
77

8-
- [ ] I have read and agree to the [Code of Conduct](https://github.com/eduardconstantin/azure-fundamentals/blob/main/CODE_OF_CONDUCT.md), and have followed the [Contributing guidelines](https://github.com/eduardconstantin/azure-fundamentals/blob/main/CONTRIBUTING.md).
8+
- [ ] I have read and agree to the [Code of Conduct](CODE_OF_CONDUCT.md), and have followed the [Contributing guidelines](CONTRIBUTING.md).
99

1010
## Pull Request Type
1111

.github/workflows/azure-static-web-apps-nice-sky-0509a9903.yml renamed to .github/workflows/azure-static-web-apps-kind-plant-0e80e5803.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
name: Build and Deploy Job
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
submodules: true
2121
- name: Setup Node.js
@@ -28,7 +28,7 @@ jobs:
2828
id: builddeploy
2929
uses: Azure/static-web-apps-deploy@v1
3030
with:
31-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_NICE_SKY_0509A9903 }}
31+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_KIND_PLANT_0E80E5803 }}
3232
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
3333
action: "upload"
3434
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
@@ -51,5 +51,5 @@ jobs:
5151
id: closepullrequest
5252
uses: Azure/static-web-apps-deploy@v1
5353
with:
54-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_NICE_SKY_0509A9903 }}
54+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_KIND_PLANT_0E80E5803 }}
5555
action: "close"

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,13 @@ yarn-error.log*
3636
# typescript
3737
*.tsbuildinfo
3838
next-env.d.ts
39+
40+
/test-results/
41+
/playwright-report/
42+
/blob-report/
43+
/playwright/.cache/
44+
45+
**/public/workbox-*.js
46+
**/public/sw.js
47+
**/public/worker-*.js
48+
**/public/sw.js.map

CODE_OF_CONDUCT.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
25+
- Focusing on what is best not just for us as individuals, but for the
2626
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
30+
- The use of sexualized language or imagery, and sexual attention or
3131
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
3535
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
36+
- Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement at
63-
ibinceanu.eduard@yahoo.com.
63+
contact@ditectrev.com.
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behavior, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing Guidelines
22

3-
First off, thank you for considering contributing to Azure Cloud Exams.
3+
First off, thank you for considering contributing to Practice Exams Platform.
44

55
It's people like you that make this project such a great tool.
66

@@ -51,15 +51,15 @@ Now clone the forked repository to your machine. Go to your GitHub account, open
5151
Open a terminal and run the following git command:
5252

5353
```
54-
git clone https://github.com/eduardconstantin/azure-cloud-exams.git
54+
git clone https://github.com/Ditectrev/Practice-Exams-Platform.git
5555
```
5656

5757
## Create a branch
5858

5959
Change to the repository directory on your computer (if you are not already there):
6060

6161
```
62-
cd azure-cloud-exams
62+
cd Practice-Exams-Platform
6363
```
6464

6565
Make sure you are on the `dev` branch by running the command :

README.md

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
<h1 align="center">Azure Cloud Exams</h1>
1+
<h1 align="center">🧪 Practice Exams Platform</h1>
22
<br />
33

44
<div align="center">
55
This is a web application built with Next.js, TypeScript, CosmosDB, GraphQL and TailwindCSS. The application is a quiz
66
that tests your knowledge of Azure fundamentals, specifically for the AZ-900 certification exam. The questions are
77
stored in a Cosmos DB database and retrieved using GraphQL queries. The application is deployed on Microsoft Azure.
88

9-
This project was created for learning purposes to help me understand Microsoft Azure and CosmosDB in preparation for
10-
the AZ-900 exam.
11-
12-
UPDATE: The project is now using this
13-
[repo](https://github.com/Ditectrev/Microsoft-Azure-AZ-900-Microsoft-Azure-Fundamentals-Exam-Questions-Answers) as a
14-
database, replacing Cosmos DB.
15-
16-
UPDATE2: The project has a new name to better fit it's purpose, now it has all azure exams from this [collection](https://github.com/Ditectrev?q=azure&type=all&language=&sort=)
9+
IMPORTANT: do not delete commented out code related to CosmosDB. We might use it to store questions soon in the future instead of from the repositories. Additionally, for the same reason let's keep Azure deployment, with that, the usage of NoSQL (CosmosDB) database is practically ready after commenting out some lines of code.
1710

1811
</div>
1912

@@ -23,19 +16,23 @@ UPDATE2: The project has a new name to better fit it's purpose, now it has all a
2316
<div align="center">
2417
<br />
2518

26-
[![Contributors](https://img.shields.io/github/contributors/eduardconstantin/azure-cloud-exams?style=flat-square)](https://github.com/eduardconstantin/azure-cloud-exams/graphs/contributors)
27-
[![Issue](https://img.shields.io/github/issues/eduardconstantin/azure-cloud-exams?style=flat-square)](https://github.com/eduardconstantin/azure-cloud-exams/issues)
28-
[![PRs](https://img.shields.io/github/issues-pr/eduardconstantin/azure-cloud-exams?style=flat-square)](https://github.com/eduardconstantin/azure-cloud-exams/pulls)
19+
[![Contributors](https://img.shields.io/github/contributors/Ditectrev/Practice-Exams-Platform?style=flat-square)](../../graphs/contributors)
20+
[![Issue](https://img.shields.io/github/issues/Ditectrev/Practice-Exams-Platform?style=flat-square)](../../issues)
21+
[![PRs](https://img.shields.io/github/issues-pr/Ditectrev/Practice-Exams-Platform?style=flat-square)](../../pulls)
2922
<br>
30-
[![Project license](https://img.shields.io/github/license/eduardconstantin/azure-cloud-exams?style=flat-square)](LICENSE)
31-
[![Stars](https://img.shields.io/github/stars/eduardconstantin/azure-cloud-exams?style=flat-square)](https://github.com/eduardconstantin/azure-cloud-exams/stargazers)
23+
[![Project license](https://img.shields.io/github/license/Ditectrev/Practice-Exams-Platform?style=flat-square)](LICENSE)
24+
[![Stars](https://img.shields.io/github/stars/Ditectrev/Practice-Exams-Platform?style=flat-square)](../../Practice-Exams-Platform/stargazers)
3225

3326
</div>
3427

28+
## Explanations
29+
30+
It's possible to have them generated using [Ollama](https://ollama.com). For installation please follow https://webinstall.dev/ollama/. Whether you want to generate explanations while running the platform on `localhost`, or on `education.ditectrev.com` it's possible. For the latter, please run `OLLAMA_ORIGINS="https://education.ditectrev.com" ollama serve` and refresh the https://education.ditectrev.com page. Facing `127.0.0.1:11434: bind: address already in use`? Fix it using https://github.com/ollama/ollama/issues/707.
31+
3532
## 🌟 Features
3633

3734
- Question sets scrapped from this
38-
[repo](https://github.com/Ditectrev?q=azure&type=all&language=&sort=).
35+
[repo](https://github.com/Ditectrev).
3936
- Correct answer displayed for each question.
4037
- Practice mode & Exam mode.
4138

@@ -44,7 +41,7 @@ UPDATE2: The project has a new name to better fit it's purpose, now it has all a
4441
Clone the repository:
4542

4643
```bash
47-
git clone https://github.com/eduardconstantin/azure-cloud-exams.git
44+
git clone https://github.com/Ditectrev/Practice-Exams-Platform.git
4845
```
4946

5047
Install dependencies:
@@ -67,6 +64,16 @@ npm run dev
6764

6865
Open your browser and navigate to [http://localhost:3000](http://localhost:3000).
6966

67+
## Star History
68+
69+
<a href="https://star-history.com/#Ditectrev/Practice-Exams-Platform&Date">
70+
<picture>
71+
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Ditectrev/Practice-Exams-Platform&type=Date&theme=dark" />
72+
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Ditectrev/Practice-Exams-Platform&type=Date" />
73+
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Ditectrev/Practice-Exams-Platform&type=Date" />
74+
</picture>
75+
</a>
76+
7077
## 👥 Contributing
7178

7279
I welcome feedback and contributions from other developers, which can help improve the quality of the code and the
@@ -75,10 +82,10 @@ application overall.
7582
In order to create an issue or a pull request with your changes, please read
7683
[our contribution guidelines](CONTRIBUTING.md), and thank you for being involved!
7784

78-
There is also a [Discussion tab](https://github.com/eduardconstantin/azure-cloud-exams/discussions)
85+
There is also a [Discussion tab](../../discussions)
7986

8087
For a full list of all authors and contributors, see
81-
[the contributors page](https://github.com/eduardconstantin/azure-cloud-exams/contributors).
88+
[the contributors page](../../contributors).
8289

8390
## 📜 License
8491

af.gif

-11 MB
Binary file not shown.

app/exam/layout.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
import { ReactNode } from "react";
2-
import { Metadata } from "next";
3-
4-
export const metadata: Metadata = {
5-
title: "Azure Cloud Exams - Exam",
6-
openGraph: {
7-
title: "Azure Cloud Exams - Exam",
8-
},
9-
};
102

113
export default function ExamLayout({ children }: { children: ReactNode }) {
124
return <>{children}</>;

app/exam/page.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Button } from "@azure-fundamentals/components/Button";
88
import QuizExamForm from "@azure-fundamentals/components/QuizExamFormUF";
99
import { Question } from "@azure-fundamentals/components/types";
1010
import ExamResult from "@azure-fundamentals/components/ExamResult";
11+
import LoadingIndicator from "@azure-fundamentals/components/LoadingIndicator";
1112

1213
const questionsQuery = gql`
1314
query RandomQuestions($range: Int!, $link: String) {
@@ -86,7 +87,7 @@ const Exam: NextPage<{ searchParams: { url: string; name: string } }> = ({
8687
setCurrentQuestion(data?.randomQuestions[0]);
8788
}, [data]);
8889

89-
if (loading) return <p>Loading</p>;
90+
if (loading) return <LoadingIndicator />;
9091
if (error) return <p>Oh no... {error.message}</p>;
9192

9293
const numberOfQuestions = data.randomQuestions.length || 0;
@@ -96,7 +97,7 @@ const Exam: NextPage<{ searchParams: { url: string; name: string } }> = ({
9697
<div>
9798
<div className="px-2 sm:px-10 w-full flex flex-row justify-between items-center">
9899
<p className="text-white font-bold text-sm sm:text-2xl">
99-
{countAnswered}/{numberOfQuestions}
100+
{countAnswered}/{numberOfQuestions}
100101
</p>
101102
<h1 className="text-white font-bold text-lg sm:text-3xl">
102103
PRACTICE EXAM

app/favicon.ico

5.25 KB
Binary file not shown.

0 commit comments

Comments
 (0)